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 9833636a323726e803c7650e6ce5070f28df4c6c Author: Ralph Goers <[email protected]> AuthorDate: Fri Jun 5 16:28:46 2026 -0700 Remove unused dependencies --- build-support/pom.xml | 66 ------ .../config/checkstyle/checkstyle-suppressions.xml | 71 ------ .../resources/config/checkstyle/checkstyle.xml | 198 ---------------- dev-docs/UpdateLicenses.md | 200 ---------------- flume-bom/pom.xml | 42 ---- flume-parent/pom.xml | 254 +-------------------- pom.xml | 1 - 7 files changed, 1 insertion(+), 831 deletions(-) diff --git a/build-support/pom.xml b/build-support/pom.xml deleted file mode 100644 index e965a3f5f..000000000 --- a/build-support/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to you under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.flume</groupId> - <artifactId>flume-project</artifactId> - <version>2.0.0-SNAPSHOT</version> - </parent> - - <groupId>org.apache.flume</groupId> - <artifactId>build-support</artifactId> - <version>2.0.0-SNAPSHOT</version> - <name>Build Support</name> - <description>Build tools and Configuration</description> - <properties> - <maven.site.skip>true</maven.site.skip> - <deploy.plugin.version>2.8.2</deploy.plugin.version> - <mvn-gpg-plugin.version>1.6</mvn-gpg-plugin.version> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>${deploy.plugin.version}</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>${mvn-gpg-plugin.version}</version> - <executions> - <execution> - <id>default-cli</id> - <goals> - <goal>sign</goal> - </goals> - <phase>package</phase> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/build-support/src/main/resources/config/checkstyle/checkstyle-suppressions.xml b/build-support/src/main/resources/config/checkstyle/checkstyle-suppressions.xml deleted file mode 100644 index 86e2d8bd0..000000000 --- a/build-support/src/main/resources/config/checkstyle/checkstyle-suppressions.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to you under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<!DOCTYPE suppressions PUBLIC - "-//Puppy Crawl//DTD Suppressions 1.0//EN" - "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd";> - -<!-- NOTE: All path separators must be specified as [/\\] in order to maintain - build compatibility with both UNIX and Windows. --> - -<suppressions> - - <!-- Suppress all style checks for generated code --> - <suppress checks=".*" - files="generated-sources|com[/\\]cloudera[/\\]flume[/\\]handlers[/\\]thrift|org[/\\]apache[/\\]flume[/\\]thrift[/\\]|org[/\\]apache[/\\]flume[/\\]source[/\\]scribe|ProtosFactory.java|avro"/> - - <!-- The "legacy" sources have a weird camelCaps package name --> - <suppress checks="PackageName" - files="org[/\\]apache[/\\]flume[/\\]source[/\\]avroLegacy|org[/\\]apache[/\\]flume[/\\]source[/\\]thriftLegacy"/> - - <!-- Allow unicode escapes in tests --> - <suppress checks="AvoidEscapedUnicodeCharacters" - files="Test.*\.java"/> - - <!-- TODO: Rearrange methods in below classes to keep overloaded methods adjacent --> - <suppress checks="OverloadMethodsDeclarationOrder" - files="channel[/\\]file|RpcClientFactory\.java|BucketPath\.java|SinkGroup\.java|DefaultSinkProcessor\.java|RegexExtractorInterceptorMillisSerializer\.java|SimpleAsyncHbaseEventSerializer\.java|hdfs[/\\]BucketWriter\.java|AbstractBasicChannelSemanticsTest\.java"/> - - <!-- TODO: Fix inner class names to follow standard convention --> - <suppress checks="TypeName" - files="SyslogUDPSource\.java|SyslogTcpSource\.java|TaildirSource\.java"/> - - <!-- TODO: Method names must follow standard Java naming conventions --> - <suppress checks="MethodNameCheck" - files="TestBucketWriter\.java|TestSyslogUtils\.java"/> - - <!-- TODO: Add default cases to switch statements --> - <suppress checks="MissingSwitchDefault" - files="SyslogUtils\.java|ReliableTaildirEventReader\.java|AbstractBasicChannelSemanticsTest\.java"/> - - <!-- TODO: Avoid empty catch blocks --> - <suppress checks="EmptyCatchBlock" - files="channel[/\\]file[/\\]LogFile\.java|TestDatasetSink\.java|CountingSourceRunner\.java|CountingSinkRunner\.java|TestKafkaChannel\.java|TestTaildirSource\.java|TestChannelProcessor\.java|TestHiveSink\.java|AbstractBasicChannelSemanticsTest\.java|TestJMSSource\.java|TestEmbeddedAgent\.java|TestAsyncHBaseSink\.java"/> - - <!-- TODO: Avoid empty if blocks --> - <suppress checks="EmptyBlockCheck" - files="ElasticSearchClientFactory\.java"/> - - <!-- TODO: Fix line length issues --> - <suppress checks="LineLengthCheck" - files="channel[/\\]MemoryChannel\.java|ReliableSpoolingFileEventReader\.java|TestAvroSink\.java"/> - - <!-- TODO: Move helper classes to their own files --> - <suppress checks="OneTopLevelClass" - files="KafkaSource\.java|KafkaChannel\.java|KafkaSink\.java|TestElasticSearchSink\.java"/> - -</suppressions> diff --git a/build-support/src/main/resources/config/checkstyle/checkstyle.xml b/build-support/src/main/resources/config/checkstyle/checkstyle.xml deleted file mode 100644 index 0396aa903..000000000 --- a/build-support/src/main/resources/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to you under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<!DOCTYPE module PUBLIC - "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" - "https://checkstyle.org/dtds/configuration_1_3.dtd";> - -<!-- - Checkstyle configuration that checks the Google coding conventions from Google Java Style - that can be found at https://google.github.io/styleguide/javaguide.html. - - Checkstyle is very configurable. Be sure to read the documentation at - http://checkstyle.sf.net (or in your downloaded distribution). - - To completely disable a check, just comment it out or delete it from the file. - - Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. - --> - -<module name = "Checker"> - <property name="charset" value="UTF-8"/> - - <property name="severity" value="error"/> - - <property name="fileExtensions" value="java, properties, xml"/> - <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - <!-- Suppress generated sources --> - <module name="SuppressionFilter"> - <property name="file" value="${checkstyle.suppressions.file}"/> - <property name="optional" value="false"/> - </module> - - <module name="LineLength"> - <property name="max" value="120"/> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - </module> - - <module name="TreeWalker"> - <module name="OuterTypeFilename"/> - <module name="IllegalTokenText"> - <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> - <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> - <property name="message" value="Avoid using corresponding octal or Unicode escape."/> - </module> - <module name="AvoidEscapedUnicodeCharacters"> - <property name="allowEscapesForControlCharacters" value="true"/> - <property name="allowByTailComment" value="true"/> - <property name="allowNonPrintableEscapes" value="true"/> - </module> - - <module name="AvoidStarImport"> - <property name="allowStaticMemberImports" value="true"/> - </module> - <module name="OneTopLevelClass"/> - <module name="NoLineWrap"/> - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <module name="NeedBraces"> - <property name="allowSingleLineStatement" value="true"/> - </module> - <module name="LeftCurly"/> - <module name="RightCurly"> - <property name="option" value="alone"/> - <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, STATIC_INIT, INSTANCE_INIT"/> - </module> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <message key="ws.notFollowed" - value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> - <message key="ws.notPreceded" - value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - <module name="OneStatementPerLine"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - <module name="FallThrough"/> - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="allowNoEmptyLineBetweenFields" value="true"/> - <property name="allowMultipleEmptyLines" value="false"/> - <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/> - <property name="tokens" value="IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT"/> - <property name="option" value="nl"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA"/> - <property name="option" value="EOL"/> - </module> - <module name="PackageName"> - <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> - <message key="name.invalidPattern" - value="Package name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="TypeName"> - <message key="name.invalidPattern" - value="Type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ClassTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Class type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MethodTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Method type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="InterfaceTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Interface type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="NoFinalizer"/> - <module name="GenericWhitespace"> - <message key="ws.followed" - value="GenericWhitespace ''{0}'' is followed by whitespace."/> - <message key="ws.preceded" - value="GenericWhitespace ''{0}'' is preceded with whitespace."/> - <message key="ws.illegalFollow" - value="GenericWhitespace ''{0}'' should followed by whitespace."/> - <message key="ws.notPreceded" - value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> - </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> - <module name="OverloadMethodsDeclarationOrder"/> - <module name="MethodParamPad"/> - <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="allowSamelineMultipleAnnotations" value="true"/> - </module> - <module name="AtclauseOrder"> - <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> - <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="MissingJavadocMethod"> - <property name="excludeScope" value="public"/> - </module> - <module name="JavadocMethod"> - <property name="accessModifiers" value=""/> - <property name="allowMissingParamTags" value="true"/> - <property name="allowMissingReturnTag" value="true"/> - <property name="allowedAnnotations" value="Override, Test"/> - </module> - <module name="MethodName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> - <message key="name.invalidPattern" - value="Method name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="SingleLineJavadoc"> - <property name="ignoreInlineTags" value="false"/> - </module> - <module name="EmptyCatchBlock"> - <property name="exceptionVariableName" value="expected"/> - </module> - <module name="CommentsIndentation"> - <property name="tokens" value="BLOCK_COMMENT_BEGIN"/> - </module> - <module name="UnusedImports"/> - <module name="RedundantImport"/> - </module> -</module> diff --git a/dev-docs/UpdateLicenses.md b/dev-docs/UpdateLicenses.md index 78c167a4f..9701c2f11 100644 --- a/dev-docs/UpdateLicenses.md +++ b/dev-docs/UpdateLicenses.md @@ -56,199 +56,6 @@ changes to the LICENSE and NOTICE files in the module's directory ALv2 license nor the boilerplate module name and copyright statement because the build will fill them in. -## flume-ng-log4jappender - -This is the list of dependencies w/versions used to create the current -LICENSE/NOTICE files for the `flume-ng-log4jappender` artifact. Each entry -notes a brief license and what is in each file. If something here changes it -will also change in the binary artifact. - -``` - org.apache.avro:avro-ipc-netty:jar:1.11.0:compile - org.apache.avro:avro-ipc:jar:1.11.0:compile - org.apache.avro:avro:jar:1.11.0:compile -``` - -ALv2. Entry in NOTICE. Embedded JS libraries from avro-ipc require entries in -LICENSE under MIT and 3-Clause BSD. - -``` - commons-codec:commons-codec:jar:1.15:compile -``` - -ALv2. Entry in NOTICE. Additional NOTICE for -org.apache.commons.codec.language.bm - - -``` - org.apache.commons:commons-compress:jar:1.21:compile -``` - -ALv2. Entry in NOTICE. LICENSE entry for LZMA SDK in public domain. - -``` - org.apache.commons:commons-lang3:jar:3.11:compile -``` - -ALv2. Entry in NOTICE. - -``` - commons-lang:commons-lang:jar:2.6:compile -``` - -ALv2. Entry in NOTICE. - -``` - commons-logging:commons-logging:jar:1.2:compile -``` - -ALv2. Entry in NOTICE. - -``` - org.apache.flume:flume-ng-sdk:jar:<project.version>:compile -``` - -ALv2. - -``` - org.apache.httpcomponents:httpclient:jar:4.5.13:compile -``` - -ALv2. Entry in NOTICE. Additional NOTICE for Public Suffix List and copy of -MPLv2.0 in LICENSE. - -``` - org.apache.httpcomponents:httpcore:jar:4.4.15:compile -``` - -ALv2. Entry in NOTICE. - -``` - com.fasterxml.jackson.core:jackson-annotations:jar:2.13.2:compile - com.fasterxml.jackson.core:jackson-core:jar:2.13.2:compile - com.fasterxml.jackson.core:jackson-databind:jar:2.13.2.1:compile -``` - -ALv2. Entry in NOTICE. - -``` - javax.annotation:javax.annotation-api:jar:1.3.2:compile -``` - -CDDLv1.1. Entry in NOTICE and LICENSE. - -``` - com.jcraft:jzlib:jar:1.1.3:compile -``` - -3-Clause BSD. Entry in LICENSE. - -``` - org.apache.thrift:libthrift:jar:0.14.1:compile -``` - -ALv2. Etnry in NOTICE. - -``` - log4j:log4j:jar:1.2.17:compile -``` - -ALv2. Entry in NOTICE. - -``` - io.netty:netty-all:jar:4.1.72.Final:compile - io.netty:netty-buffer:jar:4.1.68.Final:compile - io.netty:netty-codec-dns:jar:4.1.72.Final:compile - io.netty:netty-codec-haproxy:jar:4.1.72.Final:compile - io.netty:netty-codec-http2:jar:4.1.72.Final:compile - io.netty:netty-codec-http:jar:4.1.72.Final:compile - io.netty:netty-codec-memcache:jar:4.1.72.Final:compile - io.netty:netty-codec-mqtt:jar:4.1.72.Final:compile - io.netty:netty-codec-redis:jar:4.1.72.Final:compile - io.netty:netty-codec-smtp:jar:4.1.72.Final:compile - io.netty:netty-codec-socks:jar:4.1.72.Final:compile - io.netty:netty-codec-stomp:jar:4.1.72.Final:compile - io.netty:netty-codec-xml:jar:4.1.72.Final:compile - io.netty:netty-codec:jar:4.1.72.Final:compile - io.netty:netty-common:jar:4.1.72.Final:compile - io.netty:netty-handler-proxy:jar:4.1.72.Final:compile - io.netty:netty-handler:jar:4.1.68.Final:compile - io.netty:netty-resolver-dns-classes-macos:jar:4.1.72.Final:compile - io.netty:netty-resolver-dns-native-macos:jar:osx-aarch_64:4.1.72.Final:runtime - io.netty:netty-resolver-dns-native-macos:jar:osx-x86_64:4.1.72.Final:runtime - io.netty:netty-resolver-dns:jar:4.1.72.Final:compile - io.netty:netty-resolver:jar:4.1.72.Final:compile - io.netty:netty-tcnative-classes:jar:2.0.46.Final:compile - io.netty:netty-transport-classes-epoll:jar:4.1.72.Final:compile - io.netty:netty-transport-classes-kqueue:jar:4.1.72.Final:compile - io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.72.Final:runtime - io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.72.Final:runtime - io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.72.Final:runtime - io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.72.Final:runtime - io.netty:netty-transport-native-unix-common:jar:4.1.72.Final:compile - io.netty:netty-transport-rxtx:jar:4.1.72.Final:compile - io.netty:netty-transport-sctp:jar:4.1.72.Final:compile - io.netty:netty-transport-udt:jar:4.1.72.Final:compile - io.netty:netty-transport:jar:4.1.72.Final:compile -``` - -ALv2. Entry in NOTICE. -Additional entry in NOTICE for: -* modified Apache Harmony -* modified portion of JCTools -* modified Twitter HPACK -* modified Apache Commons Lang -LICENSE entries for: -* JSR-166 Public Domain -* Robert Harder's Base64 Public Domain -* modified Webbit 3-Clause BSD -* modified SLF4j MIT -* modified jbzip2 MIT -* modified libdivsufsort MIT -* modified jfastlz MIT -* modified protobuf 3-Clause BSD -* modified hyper hpack MIT -* modified nghttp2 hpack MIT -NOTICE and LICENSE entries for dnsinfo.h under Apple Public Source License 2.0. - -``` - org.slf4j:slf4j-api:jar:1.7.32:compile -``` - -MIT. Entry in LICENSE - -``` - org.xerial.snappy:snappy-java:jar:1.1.8.4:compile -``` - -ALv2. Entry in NOTICE. Additional NOTICE for Apache Hadoop Common. Additional -NOTICE and LICENSE entries for statically linked libstdc++. - -``` - org.apache.tomcat.embed:tomcat-embed-core:jar:8.5.46:compile - org.apache.tomcat:tomcat-annotations-api:jar:8.5.46:compile -``` - -ALv2. Entry in NOTICE. Additional NOTICE and LICENSE for XML Schemas under CDDL -v1.0 - -``` - org.apache.velocity:velocity-engine-core:jar:2.3:compile -``` - -ALv2. Entry in NOTICE. Additional entry for Apache Commons IO. - -``` - org.tukaani:xz:jar:1.9:compile -``` - -Public Domain. Entry in LICENSE. - -``` - com.github.luben:zstd-jni:jar:1.5.0-4:compile -``` - -2-Clause BSD. Entry in LICENSE. # Binary distro @@ -414,13 +221,6 @@ derby NOTICE is not relevant. flume-twitter-source-<version>.jar ``` -ALv2. Entry in NOTICE for log4j 1.2.17 from log4jappender -jar-with-dependencies. - -``` - geronimo-jms_1.1_spec-1.1.1.jar -``` - ALv2. Entry in NOTICE. ``` diff --git a/flume-bom/pom.xml b/flume-bom/pom.xml index 81cf52343..ec04c374b 100644 --- a/flume-bom/pom.xml +++ b/flume-bom/pom.xml @@ -41,7 +41,6 @@ <flume-spring-boot.version>2.0.0-SNAPSHOT</flume-spring-boot.version> <flume-taildir.version>2.0.0-SNAPSHOT</flume-taildir.version> <flume-tools.version>2.0.0-SNAPSHOT</flume-tools.version> - <!-- <flume-twitter.version>2.0.0-SNAPSHOT</flume-twitter.version> --> <flume-legacy.version>2.0.0-SNAPSHOT</flume-legacy.version> <flume-morphline.version>2.0.0-SNAPSHOT</flume-morphline.version> </properties> @@ -118,11 +117,6 @@ <artifactId>flume-spring-boot</artifactId> <version>${flume-spring-boot.version}</version> </dependency> - <!--<dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-twitter-source</artifactId> - <version>${flume-twitter.version}</version> - </dependency>--> <dependency> <groupId>org.apache.flume</groupId> <artifactId>flume-jdbc-channel</artifactId> @@ -148,17 +142,6 @@ <artifactId>flume-spillable-memory-channel</artifactId> <version>${project.version}</version> </dependency> - <!--<dependency> - <groupId>org.apache.flume.flume-ng-clients</groupId> - <artifactId>flume-ng-log4jappender</artifactId> - <version>${flume-log4jappender.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flume.flume-ng-clients</groupId> - <artifactId>flume-ng-log4jappender</artifactId> - <version>${flume-log4jappender.version}</version> - <classifier>jar-with-dependencies</classifier> - </dependency>--> <dependency> <groupId>org.apache.flume</groupId> <artifactId>flume-legacy-thrift-source</artifactId> @@ -169,21 +152,6 @@ <artifactId>flume-legacy-avro-source</artifactId> <version>${flume-legacy.version}</version> </dependency> - <!--<dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-morphline-solr-sink</artifactId> - <version>${flume-morphline.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-hdfs-sink</artifactId> - <version>${flume-hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-hive-sink</artifactId> - <version>${flume-hadoop.version}</version> - </dependency>--> <dependency> <groupId>org.apache.flume.flume-ng-sinks</groupId> <artifactId>flume-http-sink</artifactId> @@ -194,21 +162,11 @@ <artifactId>flume-irc-sink</artifactId> <version>${flume-irc.version}</version> </dependency> - <!--<dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-ng-hbase2-sink</artifactId> - <version>${flume-hadoop.version}</version> - </dependency>--> <dependency> <groupId>org.apache.flume</groupId> <artifactId>flume-kafka-sink</artifactId> <version>${flume-kafka.version}</version> </dependency> - <!--<dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-ng-kudu-sink</artifactId> - <version>${flume-hadoop.version}</version> - </dependency>--> <dependency> <groupId>org.apache.flume.flume-ng-sources</groupId> <artifactId>flume-jms-source</artifactId> diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml index 37cee093e..6f20d02ef 100644 --- a/flume-parent/pom.xml +++ b/flume-parent/pom.xml @@ -232,10 +232,7 @@ <test.include.pattern>**/Test*.java</test.include.pattern> <stagingDirectory>${project.basedir}/target/docs</stagingDirectory> - <activemq.version>5.7.0</activemq.version> - <asynchbase.version>1.8.2</asynchbase.version> <bundle-plugin.version>2.3.7</bundle-plugin.version> - <checkstyle.tool.version>8.45.1</checkstyle.tool.version> <commons-cli.version>1.5.0</commons-cli.version> <commons-codec.version>1.15</commons-codec.version> <commons-collections.version>3.2.2</commons-collections.version> @@ -249,15 +246,11 @@ <fasterxml.jackson.version>2.13.2</fasterxml.jackson.version> <fasterxml.jackson.databind.version>2.13.2.1</fasterxml.jackson.databind.version> <fest-reflect.version>1.4</fest-reflect.version> - <geronimo-jms.version>1.1.1</geronimo-jms.version> <gson.version>2.9.1</gson.version> <guava.version>29.0-jre</guava.version> <guava-old.version>11.0.2</guava-old.version> <hadoop3.version>3.2.2</hadoop3.version> <hadoop.version>${hadoop3.version}</hadoop.version> - <hbase2.version>2.5.3-hadoop3</hbase2.version> - <hbase.version>${hbase2.version}</hbase.version> - <hive.version>3.1.2</hive.version> <httpcore.version>4.4.15</httpcore.version> <httpclient.version>4.5.13</httpclient.version> <irclib.version>1.10</irclib.version> @@ -265,10 +258,7 @@ <jetty.version>9.4.51.v20230217</jetty.version> <jdom.version>1.1.3</jdom.version> <junit.version>4.13.2</junit.version> - <kite.version>1.1.0</kite.version> - <kudu.version>1.10.0</kudu.version> - <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> - <log4j.version>2.18.0</log4j.version> + <log4j.version>2.26.0</log4j.version> <mapdb.version>0.9.9</mapdb.version> <mina.version>2.1.5</mina.version> <mockito.version>5.18.0</mockito.version> @@ -276,7 +266,6 @@ <!-- Do not upgrade the assumbly plugin version until MASSEMBLY-941 is fixed --> <mvn-assembly-plugin.version>3.2.0</mvn-assembly-plugin.version> <mvn-build-helper-plugin>3.0.0</mvn-build-helper-plugin> - <mvn-checkstyle-plugin.version>3.1.2</mvn-checkstyle-plugin.version> <mvn-checksum-plugin.version>1.7</mvn-checksum-plugin.version> <mvn-clean-plugin.version>3.1.0</mvn-clean-plugin.version> <mvn-compiler-plugin.version>3.8.1</mvn-compiler-plugin.version> @@ -284,7 +273,6 @@ <mvn-gpg-plugin.version>1.6</mvn-gpg-plugin.version> <mvn-jar-plugin.version>3.2.2</mvn-jar-plugin.version> <mvn-javadoc-plugin.version>3.2.0</mvn-javadoc-plugin.version> - <mvn-paranamer-plugin.version>2.8</mvn-paranamer-plugin.version> <mvn-pmd-plugin.version>3.15.0</mvn-pmd-plugin.version> <mvn-site-plugin.version>3.9.0</mvn-site-plugin.version> <spotbugs.version>4.9.3</spotbugs.version> @@ -300,16 +288,13 @@ <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> - <solr-global.version>4.3.0</solr-global.version> <slf4j.version>1.7.32</slf4j.version> <system-rules.version>1.19.0</system-rules.version> - <twitter-source.version>2.0.0</twitter-source.version> <wiremock.version>1.53</wiremock.version> <zlib.version>1.1.3</zlib.version> <zookeeper.version>3.6.2</zookeeper.version> <os.maven.version>1.5.0.Final</os.maven.version> <redirectTestOutput>true</redirectTestOutput> - <checkstyle.skip>true</checkstyle.skip> <spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version> <palantir-java-format.version>2.90.0</palantir-java-format.version> @@ -525,18 +510,6 @@ <version>${irclib.version}</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <version>${geronimo-jms.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> - <version>${activemq.version}</version> - </dependency> - <dependency> <groupId>com.jcraft</groupId> <artifactId>jzlib</artifactId> @@ -584,28 +557,6 @@ <version>${mina.version}</version> </dependency> - <dependency> - <groupId>org.hbase</groupId> - <artifactId>asynchbase</artifactId> - <version>${asynchbase.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!--<dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>${netty.version}</version> - </dependency>--> - <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> @@ -624,66 +575,12 @@ <version>${prometheus.version}</version> </dependency> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-cell</artifactId> - <version>${solr-global.version}</version> - </dependency> - <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> <version>${snappy-java.version}</version> </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-streaming</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-core</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-cli</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Dependency for Zk provider --> <dependency> <groupId>org.apache.curator</groupId> @@ -845,150 +742,6 @@ <version>${hadoop.version}</version> </dependency> - <!-- Ideally this should be optional, but making it optional causes - build to fail. - --> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- There should be no need for Flume to include the following two - artifacts, but HBase pom has a bug which causes these to not get - pulled in. So we have to pull it in. Ideally this should be optional, - but making it optional causes build to fail. - --> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> @@ -1490,10 +1243,6 @@ </reportSet> </reportSets> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> <plugin> <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId> @@ -1577,7 +1326,6 @@ <profile> <id>skipChecks</id> <properties> - <checkstyle.skip>true</checkstyle.skip> <spotbugs.skip>true</spotbugs.skip> <pmd.skip>true</pmd.skip> <rat.skip>true</rat.skip> diff --git a/pom.xml b/pom.xml index 5bb27b329..7e360462d 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ <module>flume-tools</module> <module>flume-ng-auth</module> <module>flume-ng-configfilters</module> - <module>build-support</module> </modules> <properties>
