diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index c769db89d0e..1fa57e71031 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -968,6 +968,7 @@ lib/jackson-annotations-2.21.jar lib/jackson-core-2.21.2.jar lib/jackson-databind-2.21.2.jar lib/jackson-dataformat-yaml-2.21.2.jar +lib/jackson-datatype-jdk8-2.21.2.jar lib/jackson-datatype-joda-2.21.2.jar lib/jackson-datatype-jsr310-2.21.2.jar lib/jakarta.activation-api-2.1.3.jar @@ -1044,7 +1045,7 @@ lib/shiro-hashes-argon2-2.1.0.jar lib/shiro-hashes-bcrypt-2.1.0.jar lib/shiro-lang-2.1.0.jar lib/slf4j-api-2.0.17.jar -lib/snakeyaml-2.3.jar +lib/snakeyaml-2.5.jar lib/snappy-0.5.jar lib/spring-aop-6.1.21.jar lib/spring-beans-6.1.21.jar diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt index 7d0c0f27220..4692bd059ea 100644 --- a/geode-assembly/src/integrationTest/resources/expected_jars.txt +++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt @@ -36,6 +36,7 @@ jackson-core jackson-databind jackson-dataformat-yaml jackson-datatype-joda +jackson-datatype-jdk jackson-datatype-jsr jakarta.activation-api jakarta.annotation-api diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index b39d44afd5e..8c9700595b4 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -22,6 +22,7 @@ spring-web-6.1.21.jar commons-lang3-3.18.0.jar rmiio-2.1.2.jar jackson-datatype-joda-2.21.2.jar +jackson-datatype-jdk8-2.21.2.jar jackson-annotations-2.21.jar jackson-dataformat-yaml-2.21.2.jar jackson-core-2.21.2.jar @@ -127,7 +128,7 @@ jline-style-3.26.3.jar jline-terminal-3.26.3.jar ST4-4.3.3.jar txw2-4.0.2.jar -snakeyaml-2.3.jar +snakeyaml-2.5.jar asm-commons-9.9.1.jar asm-tree-9.9.1.jar asm-9.9.1.jar diff --git a/geode-server-all/build.gradle b/geode-server-all/build.gradle index 8472817ae37..94b525f3ae6 100644 --- a/geode-server-all/build.gradle +++ b/geode-server-all/build.gradle @@ -75,7 +75,7 @@ jar { ].each { tasks.named(it).configure { systemProperty 'test.buildVersion', version - systemProperty 'test.buildDirectory', '..' + systemProperty 'test.buildDirectory', buildDir dependsOn(tasks.named('jar')) } } diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 6b665995a61..ab32b1f57ac 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -23,6 +23,7 @@ jackson-datatype-jsr310-2.21.2.jar jackson-annotations-2.21.jar jackson-dataformat-yaml-2.21.2.jar jackson-core-2.21.2.jar +jackson-datatype-jdk8-2.21.2.jar jackson-datatype-joda-2.21.2.jar jackson-databind-2.21.2.jar httpclient5-5.4.4.jar @@ -118,7 +119,7 @@ slf4j-api-2.0.17.jar micrometer-observation-1.14.0.jar micrometer-commons-1.14.0.jar LatencyUtils-2.0.3.jar -snakeyaml-2.3.jar +snakeyaml-2.5.jar spring-jcl-6.1.21.jar asm-commons-9.9.1.jar asm-tree-9.9.1.jar