From 2f5d1634c056f995e64285ad7c4cfd676f9f615b Mon Sep 17 00:00:00 2001 From: "Damon P. Cortesi" Date: Mon, 18 Sep 2023 12:29:30 -0700 Subject: [PATCH 1/6] Exclude stax-api --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index d0dddbdec..f57c5fae7 100644 --- a/pom.xml +++ b/pom.xml @@ -363,6 +363,10 @@ org.slf4j slf4j-log4j12 + + javax.xml.stream + stax-api + @@ -396,6 +400,10 @@ org.slf4j slf4j-log4j12 + + javax.xml.stream + stax-api + @@ -427,6 +435,10 @@ log4j log4j + + javax.xml.stream + stax-api + @@ -1234,6 +1246,10 @@ ${execution.root}/dev/third-party-file.ftl true ${execution.root}/dev/third-party-missing-license.properties + + The Apache Software License, Version 2.0|Apache License, Version 2.0|The Apache License, Version 2.0|Apache 2|Apache 2.0 License|Apache License (v2.0)|Apache License 2.0|Apache Software License - Version 2.0|Apache v2|Apache-2.0 + + From a6a3da9ab3716c0d5e73dab03b4091b8c08306bf Mon Sep 17 00:00:00 2001 From: "Damon P. Cortesi" Date: Mon, 18 Sep 2023 14:25:12 -0700 Subject: [PATCH 2/6] Attempt at mass exclude --- pom.xml | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/pom.xml b/pom.xml index f57c5fae7..4b38a1617 100644 --- a/pom.xml +++ b/pom.xml @@ -367,6 +367,18 @@ javax.xml.stream stax-api + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + @@ -384,6 +396,18 @@ org.slf4j slf4j-log4j12 + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + @@ -404,6 +428,26 @@ javax.xml.stream stax-api + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-json + + + javax.xml.bind + jaxb-api + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + @@ -417,6 +461,14 @@ log4j log4j + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + @@ -439,6 +491,38 @@ javax.xml.stream stax-api + + javax.xml.bind + jaxb-api + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-server + + + com.sun.jersey.contribs + jersey-guice + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-jaxrs + @@ -458,6 +542,26 @@ log4j log4j + + javax.xml.bind + jaxb-api + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + + + com.sun.jersey.contribs + jersey-guice + @@ -494,6 +598,38 @@ org.slf4j slf4j-api + + javax.xml.bind + jaxb-api + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + com.sun.jersey + jersey-core + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.core + jersey-common + + + org.glassfish.jersey.core + jersey-server + + + javax.ws.rs + javax.ws.rs-api + @@ -533,6 +669,12 @@ org.apache.spark spark-repl_${scala.binary.version} ${spark.version} + + + com.github.rwl + jtransforms + + From fb0adb4931755aed2eca058806fdd8a72a9e9422 Mon Sep 17 00:00:00 2001 From: "Damon P. Cortesi" Date: Mon, 18 Sep 2023 15:32:42 -0700 Subject: [PATCH 3/6] jersey-server needed for livy-rsc tests --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4b38a1617..b62bf5f65 100644 --- a/pom.xml +++ b/pom.xml @@ -622,10 +622,6 @@ org.glassfish.jersey.core jersey-common - - org.glassfish.jersey.core - jersey-server - javax.ws.rs javax.ws.rs-api From 13a516ef0d99ea4df881d6f8bc494a7ea2336821 Mon Sep 17 00:00:00 2001 From: "Damon P. Cortesi" Date: Tue, 19 Sep 2023 00:04:53 -0700 Subject: [PATCH 4/6] Re-adding a few things back in --- pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pom.xml b/pom.xml index b62bf5f65..808d89463 100644 --- a/pom.xml +++ b/pom.xml @@ -465,10 +465,6 @@ com.sun.jersey jersey-core - - com.sun.jersey - jersey-server - @@ -546,22 +542,10 @@ javax.xml.bind jaxb-api - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-core - com.sun.jersey jersey-client - - com.sun.jersey.contribs - jersey-guice - @@ -622,10 +606,6 @@ org.glassfish.jersey.core jersey-common - - javax.ws.rs - javax.ws.rs-api - From 64cb0a13e6db86a5186cea69a1328fc20cfb9965 Mon Sep 17 00:00:00 2001 From: Damon Cortesi Date: Thu, 21 Sep 2023 15:54:24 -0700 Subject: [PATCH 5/6] Update doc in license file --- dev/third-party-file.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/third-party-file.ftl b/dev/third-party-file.ftl index f752269af..1c1503c1f 100644 --- a/dev/third-party-file.ftl +++ b/dev/third-party-file.ftl @@ -41,7 +41,7 @@ conditions of the following licenses. We have listed all of these third party libraries and their licenses below. This file can be regenerated at any time by simply running: - mvn clean package + mvn clean package -DskipTests -Dgenerate-third-party --------------------------------------------------- Third party Java libraries listed by License type. From 7d6fbea848820d6e3d9f591503cf487c8aced8ae Mon Sep 17 00:00:00 2001 From: Damon Cortesi Date: Thu, 21 Sep 2023 15:54:41 -0700 Subject: [PATCH 6/6] Also exclude javaassist --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 808d89463..77e2579e3 100644 --- a/pom.xml +++ b/pom.xml @@ -606,6 +606,10 @@ org.glassfish.jersey.core jersey-common + + org.javassist + javassist +