Skip to content

Drop Mina and Netty from flume-ng-core #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rgoers merged 5 commits into from
Jun 12, 2026
Merged

Drop Mina and Netty from flume-ng-core #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
370900b
Drop Mina and Netty from flume-ng-core
ppkarwasz Jun 12, 2026
4f9dd92
Open java.base packages for flume-ng-sdk SSLUtil tests
ppkarwasz Jun 12, 2026
afdf9e4
Add source-factory tests for the syslog and netcat modules
ppkarwasz Jun 12, 2026
10cebc8
Adjust spotbugs violation ceilings after the source move
ppkarwasz Jun 12, 2026
e67794d
Formatting
ppkarwasz Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions flume-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,16 @@
<artifactId>flume-taildir-source</artifactId>
<version>${flume-taildir.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-syslog-source</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-netcat-source</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-shared-kafka</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ public enum SourceType implements ComponentWithClassName {
*
* @see org.apache.flume.source.SyslogTcpSource
*/
SYSLOGTCP("org.apache.flume.source.SyslogTcpSource"),
SYSLOGTCP("org.apache.flume.source.syslog.SyslogTcpSource"),

/**
* MultiportSyslogTCPSource
*
* @see org.apache.flume.source.MultiportSyslogTCPSource
*/
MULTIPORT_SYSLOGTCP("org.apache.flume.source.MultiportSyslogTCPSource"),
MULTIPORT_SYSLOGTCP("org.apache.flume.source.syslog.MultiportSyslogTCPSource"),

/**
* SyslogUDPSource
*
* @see org.apache.flume.source.SyslogUDPSource
*/
SYSLOGUDP("org.apache.flume.source.SyslogUDPSource"),
SYSLOGUDP("org.apache.flume.source.syslog.SyslogUDPSource"),

/**
* Spool directory source
Expand Down Expand Up @@ -117,7 +117,7 @@ public enum SourceType implements ComponentWithClassName {
*
* @see org.apache.flume.source.NetcatUdpSource
*/
NETCATUDP("org.apache.flume.source.NetcatUdpSource");
NETCATUDP("org.apache.flume.source.netcat.NetcatUdpSource");

private final String sourceClassName;

Expand Down
14 changes: 2 additions & 12 deletions flume-ng-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<properties>
<!-- TODO fix spotbugs violations -->
<spotbugs.maxAllowedViolations>199</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
<spotbugs.maxAllowedViolations>152</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>64</pmd.maxAllowedViolations>
<module.name>org.apache.flume.core</module.name>
</properties>

Expand Down Expand Up @@ -133,11 +133,6 @@
<artifactId>commons-lang</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -156,11 +151,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>

</dependencies>
<build>
<plugins>
Expand Down
160 changes: 0 additions & 160 deletions flume-ng-core/src/main/java/org/apache/flume/netty/filter/PatternRule.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions flume-ng-core/src/test/java/org/apache/flume/source/TestDefaultSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@ private void verifySourceCreation(String name, String type, Class<?> typeClass)
public void testSourceCreation() throws Exception {
verifySourceCreation("seq-src", "seq", SequenceGeneratorSource.class);
verifySourceCreation("netcat-src", "netcat", NetcatSource.class);
verifySourceCreation("netcat-udp-src", "netcatudp", NetcatUdpSource.class);
verifySourceCreation("exec-src", "exec", ExecSource.class);
verifySourceCreation("syslogtcp-src", "syslogtcp", SyslogTcpSource.class);
verifySourceCreation("multiport_syslogtcp-src", "multiport_syslogtcp", MultiportSyslogTCPSource.class);
verifySourceCreation("syslogudp-src", "syslogudp", SyslogUDPSource.class);
// verifySourceCreation("spooldir-src", "spooldir", SpoolDirectorySource.class);
// verifySourceCreation("thrift-src", "thrift", ThriftSource.class);
verifySourceCreation("custom-src", MockSource.class.getCanonicalName(), MockSource.class);
Expand Down
31 changes: 0 additions & 31 deletions flume-ng-core/src/test/resources/certs/gencerts.sh
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions flume-ng-core/src/test/resources/certs/rootca.conf
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions flume-ng-core/src/test/resources/certs/server.conf
View file
Open in desktop

This file was deleted.

Binary file removed flume-ng-core/src/test/resources/keystorefile.jks
View file
Open in desktop
Binary file not shown.
17 changes: 0 additions & 17 deletions flume-ng-core/src/test/resources/server.flume-crt.pem
View file
Open in desktop

This file was deleted.

Binary file removed flume-ng-core/src/test/resources/server.flume-keystore.p12
View file
Open in desktop
Binary file not shown.
23 changes: 0 additions & 23 deletions flume-ng-core/src/test/resources/server.flume.pem
View file
Open in desktop

This file was deleted.

Binary file removed flume-ng-core/src/test/resources/server.p12
View file
Open in desktop
Binary file not shown.
Binary file removed flume-ng-core/src/test/resources/truststore.jks
View file
Open in desktop
Binary file not shown.
Binary file removed flume-ng-core/src/test/resources/truststorefile.jks
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions flume-ng-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,14 @@
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-taildir-source</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-syslog-source</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-netcat-source</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-environment-variable-config-filter</artifactId>
Expand Down
Loading
Loading