diff --git a/h2o-assemblies/main/build.gradle b/h2o-assemblies/main/build.gradle index 6231736b5867..f4d48e5d7860 100644 --- a/h2o-assemblies/main/build.gradle +++ b/h2o-assemblies/main/build.gradle @@ -93,10 +93,6 @@ shadowJar { zip64 true mergeServiceFiles() classifier = '' - // CDH 5.3.0 provides joda-time v1.6 which is too old, shadow the library instead - if (!project.hasProperty("jacocoCoverage")) { - relocate 'org.joda.time', 'ai.h2o.org.joda.time' - } exclude 'META-INF/*.DSA' exclude 'META-INF/*.SF' exclude 'synchronize.properties' diff --git a/h2o-core/build.gradle b/h2o-core/build.gradle index bd32b554a2f6..03a872b75898 100644 --- a/h2o-core/build.gradle +++ b/h2o-core/build.gradle @@ -29,6 +29,10 @@ dependencies { testRuntimeOnly project(":${defaultWebserverModule}") testCompileOnly "javax.servlet:javax.servlet-api:${servletApiVersion}" testImplementation "com.amazonaws:aws-java-sdk-s3:${awsJavaSdkVersion}" + + constraints { + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.15.0' + } } apply from: "${rootDir}/gradle/dataCheck.gradle"