This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch remove-unused-dependencies in repository https://gitbox.apache.org/repos/asf/logging-flume.git
commit 2adaeb8808f280cba7ff8e1b6c208bbfdfe0cf93 Author: Ralph Goers <[email protected]> AuthorDate: Fri Jun 5 17:09:15 2026 -0700 Remove more unused dependencies --- dev-docs/UpdateLicenses.md | 41 +------------- .../src/main/appended-resources/META-INF/LICENSE | 66 ---------------------- .../src/main/appended-resources/META-INF/NOTICE | 8 --- flume-parent/pom.xml | 17 ------ 4 files changed, 1 insertion(+), 131 deletions(-) diff --git a/dev-docs/UpdateLicenses.md b/dev-docs/UpdateLicenses.md index 9701c2f11..1263e8a53 100644 --- a/dev-docs/UpdateLicenses.md +++ b/dev-docs/UpdateLicenses.md @@ -259,8 +259,6 @@ ALv2. No NOTICE. jackson-databind-2.13.2.1.jar jackson-dataformat-csv-2.10.5.jar jackson-datatype-jdk8-2.10.5.jar - jackson-module-paranamer-2.10.5.jar - jackson-module-scala_2.13-2.10.5.jar ``` same as jar-with-dependencies @@ -277,8 +275,7 @@ same as jar-with-dependencies CDDL v1.0. Entry in LICENSE and NOTICE. -``` - jdom-1.1.3.jar + ``` BSD-like project specific. Entry in LICENSE and NOTICE. @@ -296,8 +293,6 @@ BSD-like project specific. Entry in LICENSE and NOTICE. ALv2. Entry in NOTICE. Additional entry for UnixCrypt. -``` - joda-time-2.9.9.jar ``` ALv2. Entry in NOTICE. @@ -418,38 +413,12 @@ ALv2. Entry in NOTICE. same as jar-with-dependencies, additional copyright year for netty-3.9.4. -``` - paranamer-2.8.jar -``` - -3-Claiuse BSD. Entry in LICENSE. - ``` protobuf-java-2.5.0.jar ``` 3-Clause BSD. Entry in LICENSE. -``` - scala-collection-compat_2.13-2.2.0.jar - scala-java8-compat_2.13-0.9.1.jar - scala-library-2.13.7.jar -``` - -ALv2. Entry in NOTICE. - -``` - scala-logging_2.13-3.9.2.jar -``` - -ALv2. Entry in NOTICE. - -``` - scala-reflect-2.13.3.jar -``` - -ALv2. Entry in NOTICE (covered by scala-library) - ``` slf4j-api-1.7.32.jar ``` @@ -469,14 +438,6 @@ same as jar-with-dependencies same as jar-with-dependencies -``` - twitter4j-core-3.0.3.jar - twitter4j-media-support-3.0.3.jar - twitter4j-stream-3.0.3.jar -``` - -ALv2. No NOTICE. LICENSE and NOTICE entries for bundled json library under -JSON.org license. ``` velocity-engine-core-2.3.jar diff --git a/flume-ng-dist/src/main/appended-resources/META-INF/LICENSE b/flume-ng-dist/src/main/appended-resources/META-INF/LICENSE index d80577944..5e832fe00 100644 --- a/flume-ng-dist/src/main/appended-resources/META-INF/LICENSE +++ b/flume-ng-dist/src/main/appended-resources/META-INF/LICENSE @@ -124,72 +124,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ---- -This product includes JDOM v1.1.3. - - Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. - - 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact <request_AT_jdom_DOT_org>. - - 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management <request_AT_jdom_DOT_org>. - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the - software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos - available at http://www.jdom.org/images/logos. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally - created by Jason Hunter <jhunter_AT_jdom_DOT_org> and - Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information - on the JDOM Project, please see <http://www.jdom.org/>. - ----- - -The files in the package org.apache.commons.compress.archivers.sevenz -were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/), -which has been placed in the public domain: - -LZMA SDK is placed in the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or distribute the -original LZMA SDK code, either in source code form or as a compiled binary, for -any purpose, commercial or non-commercial, and by any means. - ----- - This product contains XZ for Java All the files in this package have been written by Lasse Collin, diff --git a/flume-ng-dist/src/main/appended-resources/META-INF/NOTICE b/flume-ng-dist/src/main/appended-resources/META-INF/NOTICE index 91430face..79276a6b3 100644 --- a/flume-ng-dist/src/main/appended-resources/META-INF/NOTICE +++ b/flume-ng-dist/src/main/appended-resources/META-INF/NOTICE @@ -117,11 +117,6 @@ This product includes the following works licensed under the CDDL v1.0, see LICE * javax.servlet API 3.1.0 for source see https://javaee.github.io/servlet-spec/ --- - -This product includes software developed by the JDOM Project (http://www.jdom.org/). -For licensing details see LICENSE. - ============================================================== Jetty Web Container Copyright 1995-2018 Mort Bay Consulting Pty Ltd. @@ -151,9 +146,6 @@ granted provided that the copyright notice appears in all copies. -- -This product includes software developed by -Joda.org (http://www.joda.org/). - Apache Kafka Copyright 2021 The Apache Software Foundation. diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml index 6f20d02ef..90fcb68e0 100644 --- a/flume-parent/pom.xml +++ b/flume-parent/pom.xml @@ -254,9 +254,7 @@ <httpcore.version>4.4.15</httpcore.version> <httpclient.version>4.5.13</httpclient.version> <irclib.version>1.10</irclib.version> - <jersey.version>1.8</jersey.version> <jetty.version>9.4.51.v20230217</jetty.version> - <jdom.version>1.1.3</jdom.version> <junit.version>4.13.2</junit.version> <log4j.version>2.26.0</log4j.version> <mapdb.version>0.9.9</mapdb.version> @@ -280,13 +278,10 @@ <mvn-surefire-plugin.version>3.5.5</mvn-surefire-plugin.version> <!--<netty.version>3.10.6.Final</netty.version>--> <netty-all.version>4.1.86.Final</netty-all.version> - <parquet.version>1.11.2</parquet.version> <external.protobuf.version>4.35.0</external.protobuf.version> <protobuf.plugin.version>0.6.1</protobuf.plugin.version> <prometheus.version>0.15.0</prometheus.version> <rat.version>0.12</rat.version> - <scala.version>2.13</scala.version> - <scala-library.version>2.13.9</scala-library.version> <snappy-java.version>1.1.8.4</snappy-java.version> <slf4j.version>1.7.32</slf4j.version> <system-rules.version>1.19.0</system-rules.version> @@ -539,12 +534,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> @@ -758,12 +747,6 @@ </exclusions> </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>${jdom.version}</version> - </dependency> - <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId>
