From 356b525cca5fd20bf54b0217e80792a49c979f4d Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 7 Oct 2024 21:15:54 +0800 Subject: [PATCH] [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 --- neo4j/pom.xml | 2 - pom.xml | 23 ++++++++++ spark/interpreter/pom.xml | 7 ---- zeppelin-distribution/src/bin_license/LICENSE | 16 +++---- .../launcher/k8s-standard/pom.xml | 14 ------- zeppelin-plugins/notebookrepo/azure/pom.xml | 4 -- .../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 ba988273c0e..37dbf321a27 100644 --- a/neo4j/pom.xml +++ b/neo4j/pom.xml @@ -33,7 +33,6 @@ 4.1.1 - 2.12.7.1 neo4j @@ -41,7 +40,6 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} diff --git a/pom.xml b/pom.xml index 206ce225d72..ca05cecf7c6 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,10 @@ 2.8.9 0.2.2 20240205 + 2.12.7.20240502 9.4.52.v20230823 + 1.2.2 + 2.3.3 4.4.1 4.5.13 4.0.2 @@ -325,6 +328,26 @@ ${gson-extras.version} + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.version} + + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} + + org.apache.commons commons-configuration2 diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml index a8532c26eea..f47e0e74339 100644 --- a/spark/interpreter/pom.xml +++ b/spark/interpreter/pom.xml @@ -164,13 +164,6 @@ spark-core_${spark.scala.binary.version} ${spark.version} provided - - - - org.apache.avro - * - - diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 0d5a9ce3260..926aaceddac 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 aaa194ec706..cc685037027 100644 --- a/zeppelin-plugins/launcher/k8s-standard/pom.xml +++ b/zeppelin-plugins/launcher/k8s-standard/pom.xml @@ -52,20 +52,6 @@ jinjava ${jinjava.version} compile - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - diff --git a/zeppelin-plugins/notebookrepo/azure/pom.xml b/zeppelin-plugins/notebookrepo/azure/pom.xml index cea2ed80687..07780778171 100644 --- a/zeppelin-plugins/notebookrepo/azure/pom.xml +++ b/zeppelin-plugins/notebookrepo/azure/pom.xml @@ -50,10 +50,6 @@ azure-storage ${azure.storage.version} - - com.fasterxml.jackson.core - jackson-core - org.slf4j slf4j-api diff --git a/zeppelin-plugins/notebookrepo/filesystem/pom.xml b/zeppelin-plugins/notebookrepo/filesystem/pom.xml index c8c828c98a5..41de07e7244 100644 --- a/zeppelin-plugins/notebookrepo/filesystem/pom.xml +++ b/zeppelin-plugins/notebookrepo/filesystem/pom.xml @@ -63,10 +63,6 @@ hadoop-azure ${hadoop.version} - - com.fasterxml.jackson.core - jackson-core - com.google.guava guava @@ -79,10 +75,6 @@ org.apache.commons commons-compress - - org.codehaus.jackson - jackson-mapper-asl - com.nimbusds nimbus-jose-jwt @@ -99,14 +91,6 @@ org.eclipse.jetty jetty-servlet - - org.codehaus.jackson - jackson-core-asl - - - com.fasterxml.jackson.core - jackson-databind - org.eclipse.jetty jetty-util @@ -121,12 +105,6 @@ org.apache.hadoop hadoop-azure-datalake ${hadoop.version} - - - com.fasterxml.jackson.core - jackson-core - - @@ -138,20 +116,6 @@ org.apache.hadoop hadoop-aws ${hadoop.version} - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - diff --git a/zeppelin-plugins/notebookrepo/s3/pom.xml b/zeppelin-plugins/notebookrepo/s3/pom.xml index 1df29eee335..674ab9b26ca 100644 --- a/zeppelin-plugins/notebookrepo/s3/pom.xml +++ b/zeppelin-plugins/notebookrepo/s3/pom.xml @@ -36,38 +36,8 @@ 1.12.261 NotebookRepo/S3NotebookRepo - 2.12.6 - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.amazonaws @@ -117,22 +87,10 @@ com.google.guava guava - - com.fasterxml.jackson.core - jackson-core - org.eclipse.jetty jetty-util - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - com.google.errorprone error_prone_annotations diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml index 644b534ef38..059f9722356 100644 --- a/zeppelin-plugins/pom.xml +++ b/zeppelin-plugins/pom.xml @@ -58,10 +58,6 @@ ${project.version} provided - - com.fasterxml.jackson.core - jackson-core - commons-logging diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 93fdca7a459..df676682299 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -38,7 +38,6 @@ 2.1 1.11 4.1.0 - 2.12.7.1 9.37.2 2.0.0-M15 @@ -55,10 +54,6 @@ zeppelin-zengine ${project.version} - - com.fasterxml.jackson.core - jackson-databind - com.sun.jersey jersey-core @@ -71,10 +66,6 @@ com.sun.jersey jersey-server - - com.fasterxml.jackson.core - jackson-core - org.ow2.asm asm @@ -121,12 +112,6 @@ io.dropwizard.metrics metrics-servlets ${dropwizard.version} - - - com.fasterxml.jackson.core - jackson-databind - - @@ -173,20 +158,6 @@ org.glassfish.jersey.media jersey-media-json-jackson ${jersey.version} - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - org.glassfish.jersey.inject @@ -202,7 +173,6 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index dabe03e4c90..6326770a72e 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -39,22 +39,10 @@ 0.9.8 1.4.01 2.6.0 - - 2.9.8 4.5.4.201711221230-r 1.6 - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annocations.version} - - - - ${project.groupId} @@ -205,10 +193,6 @@ org.apache.commons commons-compress - - com.fasterxml.jackson.core - jackson-databind -