This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push: new f271b53 Revert "GEODE-10179: Bump jackson-databind from 2.10.5.1 to 2.12.6.1 (#7506)" f271b53 is described below commit f271b5335c4761b383297be4e7f858492ecd564e Author: Owen Nichols <onich...@apache.org> AuthorDate: Fri Apr 1 15:38:43 2022 -0700 Revert "GEODE-10179: Bump jackson-databind from 2.10.5.1 to 2.12.6.1 (#7506)" Fixed by mistake. We should discuss before bumping a 3rd party minor in a patch release. This reverts commit 36d9260d8180f4a83c95f723600d556fb2dc02d8. --- .../src/test/resources/expected-pom.xml | 10 +++++----- .../gradle/plugins/DependencyConstraints.groovy | 8 ++++---- .../integrationTest/resources/assembly_content.txt | 6 +++--- .../resources/dependency_classpath.txt | 6 +++--- .../DistributedSystemMBeanIntegrationTest.java | 22 +++++++--------------- 5 files changed, 22 insertions(+), 30 deletions(-) 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 c045ce6..46bf21f 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> - <version>2.12.6</version> + <version>2.11.2</version> <scope>compile</scope> </dependency> <dependency> @@ -508,7 +508,7 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-joda</artifactId> - <version>2.12.6</version> + <version>2.9.8</version> <scope>compile</scope> </dependency> <dependency> @@ -520,19 +520,19 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.12.6</version> + <version>2.10.5</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.12.6</version> + <version>2.10.5</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.12.6.1</version> + <version>2.10.5.1</version> <scope>compile</scope> </dependency> <dependency> 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 6f67364..80b6854 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 @@ -90,7 +90,7 @@ class DependencyConstraints implements Plugin<Project> { api(group: 'cglib', name: 'cglib', version: get('cglib.version')) api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.3') api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.10.5') - api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.12.6') + api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.2') api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.1') api(group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0') api(group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1') @@ -162,17 +162,17 @@ class DependencyConstraints implements Plugin<Project> { api(group: 'redis.clients', name: 'jedis', version: '2.9.0') api(group: 'xerces', name: 'xercesImpl', version: '2.12.0') api(group: 'com.arakelian', name: 'java-jq', version: '0.10.1') - api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.12.6') + api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.9.8') api(group: 'joda-time', name: 'joda-time', version: '2.9.8') } } - dependencySet(group: 'com.fasterxml.jackson.core', version: '2.12.6') { + dependencySet(group: 'com.fasterxml.jackson.core', version: '2.10.5') { entry('jackson-annotations') entry('jackson-core') } - dependencySet(group: 'com.fasterxml.jackson.core', version: '2.12.6.1') { + dependencySet(group: 'com.fasterxml.jackson.core', version: '2.10.5.1') { entry('jackson-databind') } diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 41a4467..3d8d81d 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1006,9 +1006,9 @@ lib/grumpy-core-0.2.2.jar lib/httpclient-4.5.13.jar lib/httpcore-4.4.14.jar lib/istack-commons-runtime-3.0.9.jar -lib/jackson-annotations-2.12.6.jar -lib/jackson-core-2.12.6.jar -lib/jackson-databind-2.12.6.1.jar +lib/jackson-annotations-2.10.5.jar +lib/jackson-core-2.10.5.jar +lib/jackson-databind-2.10.5.1.jar lib/javax.activation-1.2.0.jar lib/javax.activation-api-1.2.0.jar lib/javax.mail-api-1.6.2.jar diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt index 34826e8..ea81869 100644 --- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt @@ -17,9 +17,9 @@ geode-redis-0.0.0.jar geode-serialization-0.0.0.jar geode-tcp-server-0.0.0.jar geode-wan-0.0.0.jar -jackson-databind-2.12.6.1.jar -jackson-annotations-2.12.6.jar -jackson-core-2.12.6.jar +jackson-databind-2.10.5.1.jar +jackson-annotations-2.10.5.jar +jackson-core-2.10.5.jar geode-http-service-0.0.0.jar geode-unsafe-0.0.0.jar HikariCP-3.4.1.jar diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/DistributedSystemMBeanIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/DistributedSystemMBeanIntegrationTest.java index 920df23..45f5371 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/DistributedSystemMBeanIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/DistributedSystemMBeanIntegrationTest.java @@ -40,8 +40,6 @@ import org.apache.geode.test.junit.rules.ServerStarterRule; public class DistributedSystemMBeanIntegrationTest { public static final String SELECT_ALL = "select * from /testRegion r where r.id=1"; - public static final String SELECT_ALL_BUT_LOCAL_DATE = - "select name, address, startDate, endDate, title from /testRegion r where r.id=1"; public static final String SELECT_FIELDS = "select id, title from /testRegion r where r.id=1"; @ClassRule @@ -111,28 +109,22 @@ public class DistributedSystemMBeanIntegrationTest { } // this is simply to document the current behavior of gfsh + // gfsh doesn't attempt to format the date objects as of now, and it respect the json annotations + // when listing out the headers @Test public void queryAllUsingGfshDoesNotFormatDate() throws Exception { gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager); TabularResultModelAssert tabularAssert = - gfsh.executeAndAssertThat("query --query='" + SELECT_ALL_BUT_LOCAL_DATE + "'") + gfsh.executeAndAssertThat("query --query='" + SELECT_ALL + "'") .statusIsSuccess() .hasTableSection(); + // note gfsh doesn't show id field and shows "title" field as "Job Title" when doing select * tabularAssert.hasColumns().asList().containsExactlyInAnyOrder("name", "address", "startDate", - "endDate", "title"); + "endDate", "birthday", "Job Title"); tabularAssert.hasColumn("startDate").containsExactly(date.getTime() + ""); tabularAssert.hasColumn("endDate").containsExactly(sqlDate.getTime() + ""); - } - - // this is simply to document the current behavior of gfsh - // gfsh refused to format the date objects as of jackson 2.12's fix#2683 - @Test - public void queryAllUsingGfshRefusesToFormatLocalDate() throws Exception { - gfsh.connectAndVerify(server.getJmxPort(), GfshCommandRule.PortType.jmxManager); - gfsh.executeAndAssertThat("query --query='" + SELECT_ALL + "'") - .statusIsError() - .containsOutput( - "Java 8 date/time type `java.time.LocalDate` not supported by default: add Module \"com.fasterxml.jackson.datatype:jackson-datatype-jsr310\""); + tabularAssert.hasColumn("birthday") + .asList().asString().contains("\"year\":2020,\"month\":\"JANUARY\""); } @Test