This is an automated email from the ASF dual-hosted git repository. dacort pushed a commit to branch 0.8-cherrypicks in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
commit 5ca81c74214f897d9fb9f300fc4c92aabadd8358 Author: Damon P. Cortesi <[email protected]> AuthorDate: Fri Sep 22 10:40:05 2023 -0700 Remove unused Cat X licenses (#421) * Exclude unnecessary Cat X licenses where possible. --- dev/third-party-file.ftl | 2 +- pom.xml | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 1 deletion(-) diff --git a/dev/third-party-file.ftl b/dev/third-party-file.ftl index f752269a..1c1503c1 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. diff --git a/pom.xml b/pom.xml index 23561962..f4a2b11d 100644 --- a/pom.xml +++ b/pom.xml @@ -363,6 +363,22 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> </exclusions> </dependency> @@ -380,6 +396,18 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> </exclusions> </dependency> @@ -396,6 +424,30 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> </exclusions> </dependency> @@ -409,6 +461,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> </exclusions> </dependency> @@ -427,6 +483,42 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey.contribs</groupId> + <artifactId>jersey-guice</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </exclusion> </exclusions> </dependency> @@ -446,6 +538,14 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> </exclusions> </dependency> @@ -482,6 +582,34 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> @@ -521,6 +649,12 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-repl_${scala.binary.version}</artifactId> <version>${spark.version}</version> + <exclusions> + <exclusion> + <groupId>com.github.rwl</groupId> + <artifactId>jtransforms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -1234,6 +1368,10 @@ <fileTemplate>${execution.root}/dev/third-party-file.ftl</fileTemplate> <useMissingFile>true</useMissingFile> <missingFile>${execution.root}/dev/third-party-missing-license.properties</missingFile> + <licenseMerges> + <licenseMerge>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</licenseMerge> + </licenseMerges> + <!-- <overrideFile>${execution.root}/dev/third-party-missing-override.properties</overrideFile> --> </configuration> <executions> <execution>
