This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.12 by this push:
new 7a26088ce8 [ZEPPELIN-6120] Jackson dependency governance
7a26088ce8 is described below
commit 7a26088ce8bc5973c52dad154ae72ff9f9d670e2
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Mon Oct 7 21:15:54 2024 +0800
[ZEPPELIN-6120] Jackson dependency governance
### What is this PR for?
Currently, Jackson deps versions are inconsistent, which may cause
potential issues.
```
$ ls lib | grep jackson
jackson-annotations-2.12.7.jar
jackson-core-2.12.7.jar
jackson-core-asl-1.9.13.jar
jackson-databind-2.12.7.1.jar
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.9.9.jar
jersey-media-json-jackson-2.30.jar
```
### What type of PR is it?
Improvement
### Todos
* [x] - Pin Jackson 2.12.7.2
* [x] - Manage all Jackson deps via BOM
* [x] - Remove redundant exclusions
* [x] - Pin `jakarta.activation:jakarta.activation-api:1.2.2` to satisfy
enforce-dependency-convergence
* [x] - Pin `jakarta.xml.bind:jakarta.xml.bind-api:2.3.3` to satisfy
enforce-dependency-convergence
### What is the Jira issue?
ZEPPELIN-6120
### How should this be tested?
```
$ ls lib | grep jackson
jackson-annotations-2.12.7.jar
jackson-core-2.12.7.jar
jackson-core-asl-1.9.13.jar
jackson-databind-2.12.7.2.jar
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.12.7.jar
jersey-media-json-jackson-2.30.jar
```
### Screenshots (if appropriate)
### Questions:
* Does the license files need to update? Updated.
* Is there breaking changes for older versions? No.
* Does this needs documentation? No.
Closes #4863 from pan3793/ZEPPELIN-6120.
Signed-off-by: Cheng Pan <cheng...@apache.org>
(cherry picked from commit 356b525cca5fd20bf54b0217e80792a49c979f4d)
Signed-off-by: Cheng Pan <cheng...@apache.org>
---
neo4j/pom.xml | 2 --
pom.xml | 23 +++++++++++++
spark/interpreter/pom.xml | 7 ----
zeppelin-distribution/src/bin_license/LICENSE | 16 ++++-----
zeppelin-plugins/launcher/k8s-standard/pom.xml | 14 --------
zeppelin-plugins/notebookrepo/azure/pom.xml | 4 ---
zeppelin-plugins/notebookrepo/filesystem/pom.xml | 36 --------------------
zeppelin-plugins/notebookrepo/s3/pom.xml | 42 ------------------------
zeppelin-plugins/pom.xml | 4 ---
zeppelin-server/pom.xml | 30 -----------------
zeppelin-zengine/pom.xml | 16 ---------
11 files changed, 31 insertions(+), 163 deletions(-)
diff --git a/neo4j/pom.xml b/neo4j/pom.xml
index ba988273c0..37dbf321a2 100644
--- a/neo4j/pom.xml
+++ b/neo4j/pom.xml
@@ -33,7 +33,6 @@
<properties>
<neo4j.driver.version>4.1.1</neo4j.driver.version>
- <jackson.version>2.12.7.1</jackson.version>
<interpreter.name>neo4j</interpreter.name>
</properties>
@@ -41,7 +40,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 206ce225d7..ca05cecf7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,10 @@
<gson.version>2.8.9</gson.version>
<gson-extras.version>0.2.2</gson-extras.version>
<org-json.version>20240205</org-json.version>
+ <jackson.version>2.12.7.20240502</jackson.version>
<jetty.version>9.4.52.v20230823</jetty.version>
+ <jakarta.activation.version>1.2.2</jakarta.activation.version>
+ <jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
<httpcomponents.core.version>4.4.1</httpcomponents.core.version>
<httpcomponents.client.version>4.5.13</httpcomponents.client.version>
<httpcomponents.asyncclient.version>4.0.2</httpcomponents.asyncclient.version>
@@ -325,6 +328,26 @@
<version>${gson-extras.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson</groupId>
+ <artifactId>jackson-bom</artifactId>
+ <version>${jackson.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta.activation.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index a8532c26ee..f47e0e7433 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -164,13 +164,6 @@
<artifactId>spark-core_${spark.scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
- <exclusions>
- <!-- Leads to conflicting Jackson versions in tests -->
- <exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/zeppelin-distribution/src/bin_license/LICENSE
b/zeppelin-distribution/src/bin_license/LICENSE
index 0d5a9ce326..926aacedda 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -48,12 +48,15 @@ The following components are provided under Apache License.
(Apache 2.0) Codehaus Plexus Utils (org.codehaus.plexus:plexus-utils:3.2.1
- http://github.com/codehaus-plexus/plexus-utils)
(Apache 2.0) findbugs jsr305 (com.google.code.findbugs:jsr305:jar:1.3.9 -
http://findbugs.sourceforge.net/)
(Apache 2.0) Google Guava (com.google.guava:guava:15.0 -
https://code.google.com/p/guava-libraries/)
- (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-core:2.9.10 -
https://github.com/FasterXML/jackson-core)
- (Apache 2.0) Jackson
(com.fasterxml.jackson.core:jackson-annotations:2.9.10 -
https://github.com/FasterXML/jackson-core)
- (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-databind:2.9.10.8
- https://github.com/FasterXML/jackson-core)
+ (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-core:2.15.4 -
https://github.com/FasterXML/jackson-core)
+ (Apache 2.0) Jackson
(com.fasterxml.jackson.core:jackson-annotations:2.15.4 -
https://github.com/FasterXML/jackson-core)
+ (Apache 2.0) Jackson (com.fasterxml.jackson.core:jackson-databind:2.15.4 -
https://github.com/FasterXML/jackson-core)
+ (Apache 2.0) Jackson-dataformat-CBOR
(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.4 -
http://wiki.fasterxml.com/JacksonForCbor)
+ (Apache 2.0) Jackson-dataformat-Smile
(com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.4 -
http://wiki.fasterxml.com/JacksonForSmile)
+ (Apache 2.0) Jackson-dataformat-YAML
(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.4 -
https://github.com/FasterXML/jackson)
+ (Apache 2.0) Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 -
http://jackson.codehaus.org/)
(Apache 2.0) Jackson Mapper ASL
(org.codehaus.jackson:jackson-mapper-asl:1.9.13 -
https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl/1.9.13)
(Apache 2.0) javax.servlet
(org.eclipse.jetty.orbit:javax.servlet:jar:3.1.0.v201112011016 -
http://www.eclipse.org/jetty)
- (Apache 2.0) Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 -
http://jackson.codehaus.org/)
(Apache 2.0) Javassist (org.javassist:javassist:jar:3.18.1-GA:compile -
http://jboss-javassist.github.io/javassist/)
(Apache 2.0) JetS3t (net.java.dev.jets3t:jets3t:jar:0.9.3) -
http://www.jets3t.org/
(Apache 2.0) Jetty (org.eclipse.jetty:jetty - http://www.eclipse.org/jetty)
@@ -68,9 +71,6 @@ The following components are provided under Apache License.
(Apache 2.0) RoaringBitmap (org.roaringbitmap:RoaringBitmap:jar:0.5.11 -
https://github.com/lemire/RoaringBitmap)
(Apache 2.0) json4s (org.json4s:json4s-ast_2.10:jar:3.2.10 -
https://github.com/json4s/json4s)
(Apache 2.0) HPPC Collections (com.carrotsearch:hppc:0.7.1 -
http://labs.carrotsearch.com/hppc.html/hppc)
- (Apache 2.0) Jackson-dataformat-CBOR
(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.2 -
http://wiki.fasterxml.com/JacksonForCbor)
- (Apache 2.0) Jackson-dataformat-Smile
(com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.6.2 -
http://wiki.fasterxml.com/JacksonForSmile)
- (Apache 2.0) Jackson-dataformat-YAML
(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.6.2 -
https://github.com/FasterXML/jackson)
(Apache 2.0) json-flattener (com.github.wnameless:json-flattener:0.1.6 -
https://github.com/wnameless/json-flattener)
(Apache 2.0) Spatial4J (com.spatial4j:spatial4j:0.4.1 -
https://github.com/spatial4j/spatial4j)
(Apache 2.0) T-Digest (com.tdunning:t-digest:3.0 -
https://github.com/tdunning/t-digest)
@@ -126,7 +126,7 @@ The following components are provided under Apache License.
(Apache 2.0) parboiled-java (org.parboiled:parboiled-java:1.1.7 -
https://github.com/sirthias/parboiled)
(Apache 2.0) parboiled-core (org.parboiled:parboiled-core:1.1.7 -
https://github.com/sirthias/parboiled)
(Apache 2.0) ZkClient (com.101tec:zkclient:0.7 -
https://github.com/sgroschupf/zkclient)
- (Apache 2.0) jackson-module-scala
(com.fasterxml.jackson.module:jackson-module-scala_2.10:2.4.4 -
http://wiki.fasterxml.com/JacksonModuleScala)
+ (Apache 2.0) jackson-module-scala
(com.fasterxml.jackson.module:jackson-module-scala_2.10:2.15.4 -
http://wiki.fasterxml.com/JacksonModuleScala)
(Apache 2.0) BigQuery API v2-rev317-1.22.0
(com.google.apis:google-api-services-bigquery:v2-rev317-1.22.0 -
http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-bigquery)
(Apache 2.0) Google Cloud Debugger API v2-rev8-1.22.0
(com.google.apis:google-api-services-clouddebugger:v2-rev8-1.22.0 -
http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-clouddebugger)
(Apache 2.0) Google Dataflow API v1b3-rev36-1.22.0
(com.google.apis:google-api-services-dataflow:v1b3-rev36-1.22.0 -
http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-dataflow)
diff --git a/zeppelin-plugins/launcher/k8s-standard/pom.xml
b/zeppelin-plugins/launcher/k8s-standard/pom.xml
index aaa194ec70..cc68503702 100644
--- a/zeppelin-plugins/launcher/k8s-standard/pom.xml
+++ b/zeppelin-plugins/launcher/k8s-standard/pom.xml
@@ -52,20 +52,6 @@
<artifactId>jinjava</artifactId>
<version>${jinjava.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Test libraries -->
<dependency>
diff --git a/zeppelin-plugins/notebookrepo/azure/pom.xml
b/zeppelin-plugins/notebookrepo/azure/pom.xml
index cea2ed8068..0778077817 100644
--- a/zeppelin-plugins/notebookrepo/azure/pom.xml
+++ b/zeppelin-plugins/notebookrepo/azure/pom.xml
@@ -50,10 +50,6 @@
<artifactId>azure-storage</artifactId>
<version>${azure.storage.version}</version>
<exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
index c8c828c98a..41de07e724 100644
--- a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
+++ b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
@@ -63,10 +63,6 @@
<artifactId>hadoop-azure</artifactId>
<version>${hadoop.version}</version>
<exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -79,10 +75,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
<exclusion>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
@@ -99,14 +91,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
@@ -121,12 +105,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure-datalake</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</profile>
@@ -138,20 +116,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</profile>
diff --git a/zeppelin-plugins/notebookrepo/s3/pom.xml
b/zeppelin-plugins/notebookrepo/s3/pom.xml
index 1df29eee33..674ab9b26c 100644
--- a/zeppelin-plugins/notebookrepo/s3/pom.xml
+++ b/zeppelin-plugins/notebookrepo/s3/pom.xml
@@ -36,38 +36,8 @@
<properties>
<aws.sdk.version>1.12.261</aws.sdk.version>
<plugin.name>NotebookRepo/S3NotebookRepo</plugin.name>
- <jackson.version>2.12.6</jackson.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <!-- Fix enforcer plugin,
- since aws-java-sdk-s3 ships with multiple artifact versions of
- com.fasterxml.jackson.core:jackson-databind. -->
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- <version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
@@ -117,22 +87,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml
index 644b534ef3..059f972235 100644
--- a/zeppelin-plugins/pom.xml
+++ b/zeppelin-plugins/pom.xml
@@ -58,10 +58,6 @@
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
<!-- jcl-over-slf4j is provided by zeppelin-interprerter -->
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 93fdca7a45..df67668229 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -38,7 +38,6 @@
<javax.ws.rsapi.version>2.1</javax.ws.rsapi.version>
<libpam4j.version>1.11</libpam4j.version>
<jna.version>4.1.0</jna.version>
- <jackson.version>2.12.7.1</jackson.version>
<nimbus.version>9.37.2</nimbus.version>
<kerberos.version>2.0.0-M15</kerberos.version>
@@ -55,10 +54,6 @@
<artifactId>zeppelin-zengine</artifactId>
<version>${project.version}</version>
<exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
@@ -71,10 +66,6 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
@@ -121,12 +112,6 @@
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-servlets</artifactId>
<version>${dropwizard.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -173,20 +158,6 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
@@ -202,7 +173,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index dabe03e4c9..6326770a72 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -39,22 +39,10 @@
<org.reflections.version>0.9.8</org.reflections.version>
<xml.apis.version>1.4.01</xml.apis.version>
<commons.vfs2.version>2.6.0</commons.vfs2.version>
- <!-- Should match which the version from commons-vfs2 -->
- <jackson.annocations.version>2.9.8</jackson.annocations.version>
<eclipse.jgit.version>4.5.4.201711221230-r</eclipse.jgit.version>
<eirslett.version>1.6</eirslett.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.annocations.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -205,10 +193,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
</exclusions>
</dependency>
