This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 4947c025dc1 Revert "Bump jackson version from 2.13.2 to 2.13.3
(#16508)"
4947c025dc1 is described below
commit 4947c025dc17014c0919814157cfddf9cce862c0
Author: Jiwe Guo <[email protected]>
AuthorDate: Thu Aug 25 11:05:25 2022 +0800
Revert "Bump jackson version from 2.13.2 to 2.13.3 (#16508)"
This reverts commit 7db1af31ac6a4fc6c7dff40e51c77cb8479218b0.
---
distribution/server/src/assemble/LICENSE.bin.txt | 16 +++---
pom.xml | 8 ++-
pulsar-sql/pom.xml | 66 ++++++++++++++++++++++++
pulsar-sql/presto-distribution/LICENSE | 28 +++++-----
pulsar-sql/presto-distribution/pom.xml | 9 ++++
tests/docker-images/java-test-functions/pom.xml | 1 +
6 files changed, 105 insertions(+), 23 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index a92def290ee..2a162f5cee6 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -312,14 +312,14 @@ The Apache Software License, Version 2.0
* JCommander -- com.beust-jcommander-1.82.jar
* High Performance Primitive Collections for Java --
com.carrotsearch-hppc-0.9.1.jar
* Jackson
- - com.fasterxml.jackson.core-jackson-annotations-2.13.3.jar
- - com.fasterxml.jackson.core-jackson-core-2.13.3.jar
- - com.fasterxml.jackson.core-jackson-databind-2.13.3.jar
- - com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.13.3.jar
- - com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.13.3.jar
- - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.13.3.jar
- - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.13.3.jar
- - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.13.3.jar
+ - com.fasterxml.jackson.core-jackson-annotations-2.13.2.jar
+ - com.fasterxml.jackson.core-jackson-core-2.13.2.jar
+ - com.fasterxml.jackson.core-jackson-databind-2.13.2.1.jar
+ - com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.13.2.jar
+ - com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.13.2.jar
+ - com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.13.2.jar
+ - com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.13.2.jar
+ - com.fasterxml.jackson.module-jackson-module-jsonSchema-2.13.2.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.9.1.jar
* Conscrypt -- org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar
* Proto Google Common Protos --
com.google.api.grpc-proto-google-common-protos-2.0.1.jar
diff --git a/pom.xml b/pom.xml
index 34fd6a83409..21add4a056d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,8 @@ flexible messaging model and an intuitive client
API.</description>
<log4j2.version>2.18.0</log4j2.version>
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastlefips.version>1.0.2</bouncycastlefips.version>
- <jackson.version>2.13.3</jackson.version>
+ <jackson.version>2.13.2</jackson.version>
+ <jackson.databind.version>2.13.2.1</jackson.databind.version>
<reflections.version>0.9.11</reflections.version>
<swagger.version>1.6.2</swagger.version>
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
@@ -798,6 +799,11 @@ flexible messaging model and an intuitive client
API.</description>
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.databind.version}</version>
+ </dependency>
<dependency>
<groupId>org.hdrhistogram</groupId>
diff --git a/pulsar-sql/pom.xml b/pulsar-sql/pom.xml
index cb5d58e7c30..68ffd73ec80 100644
--- a/pulsar-sql/pom.xml
+++ b/pulsar-sql/pom.xml
@@ -41,6 +41,72 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.databind.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base </artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jsonSchema</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
<!-- keep using okhttp3 3.x for Presto -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index 5952ec6e48b..2eaf5f7302f 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -207,19 +207,19 @@ This projects includes binary packages with the following
licenses:
The Apache Software License, Version 2.0
* Jackson
- - jackson-annotations-2.13.3.jar
- - jackson-core-2.13.3.jar
- - jackson-databind-2.13.3.jar
- - jackson-dataformat-smile-2.13.3.jar
- - jackson-datatype-guava-2.13.3.jar
- - jackson-datatype-jdk8-2.13.3.jar
- - jackson-datatype-joda-2.13.3.jar
- - jackson-datatype-jsr310-2.13.3.jar
- - jackson-dataformat-yaml-2.13.3.jar
- - jackson-jaxrs-base-2.13.3.jar
- - jackson-jaxrs-json-provider-2.13.3.jar
- - jackson-module-jaxb-annotations-2.13.3.jar
- - jackson-module-jsonSchema-2.13.3.jar
+ - jackson-annotations-2.13.2.jar
+ - jackson-core-2.13.2.jar
+ - jackson-databind-2.13.2.1.jar
+ - jackson-dataformat-smile-2.13.2.jar
+ - jackson-datatype-guava-2.13.2.jar
+ - jackson-datatype-jdk8-2.13.2.jar
+ - jackson-datatype-joda-2.13.2.jar
+ - jackson-datatype-jsr310-2.13.2.jar
+ - jackson-dataformat-yaml-2.13.2.jar
+ - jackson-jaxrs-base-2.13.2.jar
+ - jackson-jaxrs-json-provider-2.13.2.jar
+ - jackson-module-jaxb-annotations-2.13.2.jar
+ - jackson-module-jsonSchema-2.13.2.jar
* Guava
- guava-31.0.1-jre.jar
- listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
@@ -459,7 +459,7 @@ The Apache Software License, Version 2.0
* Snappy
- snappy-java-1.1.8.4.jar
* Jackson
- - jackson-module-parameter-names-2.13.3.jar
+ - jackson-module-parameter-names-2.13.2.jar
* Java Assist
- javassist-3.25.0-GA.jar
* Java Native Access
diff --git a/pulsar-sql/presto-distribution/pom.xml
b/pulsar-sql/presto-distribution/pom.xml
index 956503ee49f..bdf3f88360d 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -143,46 +143,55 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
+ <version>${jackson.version}</version>
</dependency>
</dependencies>
diff --git a/tests/docker-images/java-test-functions/pom.xml
b/tests/docker-images/java-test-functions/pom.xml
index 603ea4c01cf..63f87bc682a 100644
--- a/tests/docker-images/java-test-functions/pom.xml
+++ b/tests/docker-images/java-test-functions/pom.xml
@@ -49,6 +49,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <version>${jackson.databind.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
