diff --git a/build.gradle b/build.gradle index a0d351666c7..f3ea259ae9e 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,9 @@ buildscript { ext { opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT") + spring_version = "5.3.22" + jackson_version = "2.13.2" + jackson_databind_version = "2.13.2.2" } repositories { @@ -123,6 +126,10 @@ subprojects { "org.checkstyle.google.suppressionfilter.config": rootProject.file("config/checkstyle/suppressions.xml")] ignoreFailures = false } + + configurations.all { + resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}" + } } checkstyle { configFile file("config/checkstyle/checkstyle.xml") diff --git a/core/build.gradle b/core/build.gradle index 17bb1e1a71d..5ced00381a7 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -40,8 +40,8 @@ repositories { dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-context', version: "${spring_version}" + compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}" compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' compile group: 'com.facebook.presto', name: 'presto-matching', version: '0.240' compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' @@ -49,7 +49,7 @@ dependencies { testImplementation('org.junit.jupiter:junit-jupiter:5.6.2') testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1' - testCompile group: 'org.springframework', name: 'spring-test', version: '5.2.20.RELEASE' + testCompile group: 'org.springframework', name: 'spring-test', version: "${spring_version}" testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3' testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.3.3' } diff --git a/opensearch/build.gradle b/opensearch/build.gradle index a7814de2285..88019a0542d 100644 --- a/opensearch/build.gradle +++ b/opensearch/build.gradle @@ -32,9 +32,9 @@ dependencies { compile project(':core') compile group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" compile "io.github.resilience4j:resilience4j-retry:1.5.0" - compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2' - compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}" + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}" + compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}" compile group: 'org.json', name: 'json', version:'20180813' compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}" compile group: 'org.opensearch', name:'opensearch-ml-client', version: '1.3.4.0-SNAPSHOT' diff --git a/plugin/build.gradle b/plugin/build.gradle index f6aa1fd63ce..bd38048c01e 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -62,7 +62,7 @@ configurations.all { } dependencies { - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}" compile project(":ppl") compile project(':legacy') compile project(':opensearch') diff --git a/ppl/build.gradle b/ppl/build.gradle index 4b0d3615558..8b96d302d8f 100644 --- a/ppl/build.gradle +++ b/ppl/build.gradle @@ -48,8 +48,8 @@ dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' compile group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}" compile group: 'org.json', name: 'json', version: '20180813' - compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-context', version: "${spring_version}" + compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}" compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1' compile project(':common') compile project(':core') diff --git a/protocol/build.gradle b/protocol/build.gradle index c77a50ec874..bd36f4dc067 100644 --- a/protocol/build.gradle +++ b/protocol/build.gradle @@ -30,9 +30,9 @@ plugins { dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2' - compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}" + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}" + compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}" implementation 'com.google.code.gson:gson:2.8.9' compile project(':core') compile project(':opensearch') diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index b1f45b09944..a4324080fd5 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -46,7 +46,7 @@ repositories { dependencies { implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2' implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.452' testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.1') diff --git a/sql/build.gradle b/sql/build.gradle index e49810fb5f1..8572be7f3f4 100644 --- a/sql/build.gradle +++ b/sql/build.gradle @@ -47,8 +47,8 @@ dependencies { compile "org.antlr:antlr4-runtime:4.7.1" implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' compile group: 'org.json', name: 'json', version:'20180813' - compile group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' - compile group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + compile group: 'org.springframework', name: 'spring-context', version: "${spring_version}" + compile group: 'org.springframework', name: 'spring-beans', version: "${spring_version}" compile project(':common') compile project(':core') compile project(':protocol')