diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml index e8439542aa14..3447b67ec04d 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -490,7 +490,12 @@ com.fasterxml.jackson.core jackson-databind - 2.13.2 + 2.13.2.1 + + + com.fasterxml.jackson + jackson-bom + 2.13.2.20220324 com.fasterxml.jackson.datatype diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index 553709e04001..7d8df163193c 100644 --- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -46,6 +46,8 @@ class DependencyConstraints implements Plugin { deps.put("slf4j-api.version", "1.7.32") deps.put("jboss-modules.version", "1.11.0.Final") deps.put("jackson.version", "2.13.2") + deps.put("jackson.databind.version", "2.13.2.1") + deps.put("jackson.bom.version", "2.13.2.20220324") deps.put("springshell.version", "1.2.0.RELEASE") deps.put("springframework.version", "5.3.16") @@ -185,9 +187,16 @@ class DependencyConstraints implements Plugin { dependencySet(group: 'com.fasterxml.jackson.core', version: get('jackson.version')) { entry('jackson-annotations') entry('jackson-core') + } + + dependencySet(group: 'com.fasterxml.jackson.core', version: get('jackson.databind.version')) { entry('jackson-databind') } + dependencySet(group: 'com.fasterxml.jackson', version: get('jackson.bom.version')) { + entry('jackson-bom') + } + dependencySet(group: 'com.fasterxml.jackson.datatype', version: get('jackson.version')) { entry('jackson-datatype-joda') entry('jackson-datatype-jsr310') diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index f2aeef1eb018..81fa2d58a895 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1007,7 +1007,7 @@ lib/httpcore-4.4.15.jar lib/istack-commons-runtime-4.0.1.jar lib/jackson-annotations-2.13.2.jar lib/jackson-core-2.13.2.jar -lib/jackson-databind-2.13.2.jar +lib/jackson-databind-2.13.2.1.jar lib/javax.activation-api-1.2.0.jar lib/javax.mail-api-1.6.2.jar lib/javax.resource-api-1.7.1.jar diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index aeffe9b3600c..9f06136b993e 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -38,7 +38,7 @@ httpcore-4.4.15.jar istack-commons-runtime-4.0.1.jar jackson-annotations-2.13.2.jar jackson-core-2.13.2.jar -jackson-databind-2.13.2.jar +jackson-databind-2.13.2.1.jar javax.activation-api-1.2.0.jar javax.resource-api-1.7.1.jar javax.servlet-api-3.1.0.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index aeffe9b3600c..9f06136b993e 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -38,7 +38,7 @@ httpcore-4.4.15.jar istack-commons-runtime-4.0.1.jar jackson-annotations-2.13.2.jar jackson-core-2.13.2.jar -jackson-databind-2.13.2.jar +jackson-databind-2.13.2.1.jar javax.activation-api-1.2.0.jar javax.resource-api-1.7.1.jar javax.servlet-api-3.1.0.jar