From 262feb160d299c8e4a3dd142b4ec7b983414af13 Mon Sep 17 00:00:00 2001 From: ZhangJian He Date: Sun, 10 Jul 2022 15:53:40 +0800 Subject: [PATCH] Bump jackson version from 2.13.2 to 2.13.3 --- .../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 --- .../docker-images/java-test-functions/pom.xml | 1 - 6 files changed, 23 insertions(+), 105 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 0707feb6e8e7a..a543a9017bcde 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.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 + - 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 * 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 e86b6ff7ffdda..10be5ffb4d98d 100644 --- a/pom.xml +++ b/pom.xml @@ -134,8 +134,7 @@ flexible messaging model and an intuitive client API. 2.17.1 1.69 1.0.2 - 2.13.2 - 2.13.2.1 + 2.13.3 0.9.11 1.6.2 8.37 @@ -801,11 +800,6 @@ flexible messaging model and an intuitive client API. pom import - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - org.hdrhistogram diff --git a/pulsar-sql/pom.xml b/pulsar-sql/pom.xml index edc98c53d3630..3e682619e5622 100644 --- a/pulsar-sql/pom.xml +++ b/pulsar-sql/pom.xml @@ -41,72 +41,6 @@ - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-guava - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - com.squareup.okhttp3 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 6ef9037d7c2b6..b53b999ce764a 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.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 + - 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 * Guava - guava-31.0.1-jre.jar - listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar @@ -455,7 +455,7 @@ The Apache Software License, Version 2.0 * Snappy - snappy-java-1.1.8.4.jar * Jackson - - jackson-module-parameter-names-2.13.2.jar + - jackson-module-parameter-names-2.13.3.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 a35e3f00519bb..a92f0f376519a 100644 --- a/pulsar-sql/presto-distribution/pom.xml +++ b/pulsar-sql/presto-distribution/pom.xml @@ -143,55 +143,46 @@ com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.databind.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-joda - ${jackson.version} com.fasterxml.jackson.dataformat jackson-dataformat-yaml - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-guava - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-jdk8 - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} com.fasterxml.jackson.dataformat jackson-dataformat-smile - ${jackson.version} diff --git a/tests/docker-images/java-test-functions/pom.xml b/tests/docker-images/java-test-functions/pom.xml index c4f342d191a7c..666655469b452 100644 --- a/tests/docker-images/java-test-functions/pom.xml +++ b/tests/docker-images/java-test-functions/pom.xml @@ -49,7 +49,6 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.databind.version} provided