This is an automated email from the ASF dual-hosted git repository. dacort pushed a commit to branch fix/test-license in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
commit 2f5d1634c056f995e64285ad7c4cfd676f9f615b Author: Damon P. Cortesi <[email protected]> AuthorDate: Mon Sep 18 12:29:30 2023 -0700 Exclude stax-api --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index d0dddbde..f57c5fae 100644 --- a/pom.xml +++ b/pom.xml @@ -363,6 +363,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -396,6 +400,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -427,6 +435,10 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -1234,6 +1246,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>
