Skip to content

Commit

Permalink
PROTON-2852 Remove the experimental Netty 5 support
Browse files Browse the repository at this point in the history
Removes current experimental Netty 5 code as that has stopped evolving
and current code won't work with the long unreleased netty 5 branch
code.
  • Loading branch information
tabish121 committed Sep 19, 2024
1 parent 169de36 commit 198deba
Show file tree
Hide file tree
Showing 39 changed files with 7 additions and 11,577 deletions.
44 changes: 0 additions & 44 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<hamcrest.version>3.0</hamcrest.version>
<netty.version>4.1.113.Final</netty.version>
<netty.iouring.version>0.0.25.Final</netty.iouring.version>
<netty5.version>5.0.0.Alpha5</netty5.version>
<netty.tcnative.version>2.0.66.Final</netty.tcnative.version>

<!-- Plugin versions -->
Expand All @@ -64,11 +63,6 @@
<netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
<netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier>

<netty5-scope>provided</netty5-scope>
<netty5-transport-native-io-uring-classifier>linux-x86_64</netty5-transport-native-io-uring-classifier>
<netty5-transport-native-epoll-classifier>linux-x86_64</netty5-transport-native-epoll-classifier>
<netty5-transport-native-kqueue-classifier>osx-x86_64</netty5-transport-native-kqueue-classifier>

<!-- surefire forked jvm arguments -->
<argLine>-Xmx2g -enableassertions ${jacoco-config}</argLine>

Expand Down Expand Up @@ -170,44 +164,6 @@
<version>${netty.iouring.version}</version>
<classifier>${netty-transport-native-io-uring-classifier}</classifier>
</dependency>
<!-- Netty 5 Dependencies-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-buffer</artifactId>
<version>${netty5.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-common</artifactId>
<version>${netty5.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-handler</artifactId>
<version>${netty5.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-transport</artifactId>
<version>${netty5.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-codec-http</artifactId>
<version>${netty5.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-transport-native-epoll</artifactId>
<version>${netty5.version}</version>
<classifier>${netty-transport-native-epoll-classifier}</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-transport-native-kqueue</artifactId>
<version>${netty5.version}</version>
<classifier>${netty-transport-native-kqueue-classifier}</classifier>
</dependency>
<!-- Testing only Uber Jar inclusion -->
<dependency>
<groupId>io.netty</groupId>
Expand Down
38 changes: 0 additions & 38 deletions protonj2-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,44 +83,6 @@
<classifier>${netty-transport-native-kqueue-classifier}</classifier>
<scope>${netty-scope}</scope>
</dependency>
<!-- Netty 5 Development dependencies -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-buffer</artifactId>
<scope>${netty5-scope}</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-common</artifactId>
<scope>${netty5-scope}</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-handler</artifactId>
<scope>${netty5-scope}</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-transport</artifactId>
<scope>${netty5-scope}</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-codec-http</artifactId>
<scope>${netty5-scope}</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-transport-native-epoll</artifactId>
<classifier>${netty-transport-native-epoll-classifier}</classifier>
<scope>${netty5-scope}</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty5-transport-native-kqueue</artifactId>
<classifier>${netty5-transport-native-kqueue-classifier}</classifier>
<scope>${netty5-scope}</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.qpid</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import org.apache.qpid.protonj2.client.TransportOptions;
import org.apache.qpid.protonj2.client.transport.netty4.Netty4IOContext;
import org.apache.qpid.protonj2.client.transport.netty4.Netty4Support;
import org.apache.qpid.protonj2.client.transport.netty5.Netty5IOContext;
import org.apache.qpid.protonj2.client.transport.netty5.Netty5Support;
import org.apache.qpid.protonj2.engine.Scheduler;

/**
Expand Down Expand Up @@ -69,8 +67,6 @@ public interface IOContext {
static IOContext create(TransportOptions options, SslOptions sslOptions, String ioThreadName) {
if (Netty4Support.isAvailable()) {
return new Netty4IOContext(options, sslOptions, ioThreadName);
} else if (Netty5Support.isAvailable()) {
return new Netty5IOContext(options, sslOptions, ioThreadName);
}

throw new UnsupportedOperationException("Netty not available on the class path");
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 198deba

Please sign in to comment.