Make build pass on Java 10 (#7922)
Motivation: Java 10 is out so we should be able to build netty with it (and run the tests). Modifications: - Update Mockito and JBoss Marshalling to support Java 10 - Fix unit test to not depend on specific cipher which is not present in Java 10 anymore Result: Netty builds (and runs all tests) when using Java 10
This commit is contained in:
parent
5256d17363
commit
cff87de44c
24
pom.xml
24
pom.xml
@ -68,6 +68,21 @@
|
||||
</developers>
|
||||
|
||||
<profiles>
|
||||
<!-- JDK10 -->
|
||||
<profile>
|
||||
<id>java10</id>
|
||||
<activation>
|
||||
<jdk>10</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- Not use alpn agent as Java10 supports alpn out of the box -->
|
||||
<argLine.alpnAgent />
|
||||
<forbiddenapis.skip>true</forbiddenapis.skip>
|
||||
<!-- Needed because of https://issues.apache.org/jira/browse/MENFORCER-275 -->
|
||||
<enforcer.plugin.version>3.0.0-M1</enforcer.plugin.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<!-- JDK9 -->
|
||||
<profile>
|
||||
<id>java9</id>
|
||||
@ -167,17 +182,12 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<netty.build.version>22</netty.build.version>
|
||||
<jboss.marshalling.version>1.4.11.Final</jboss.marshalling.version>
|
||||
<jboss.marshalling.version>2.0.5.Final</jboss.marshalling.version>
|
||||
<jetty.alpnAgent.version>2.0.7</jetty.alpnAgent.version>
|
||||
<jetty.alpnAgent.path>"${settings.localRepository}"/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar</jetty.alpnAgent.path>
|
||||
<argLine.common>
|
||||
-server
|
||||
-dsa -da -ea:io.netty...
|
||||
-XX:+AggressiveOpts
|
||||
-XX:+TieredCompilation
|
||||
-XX:+UseBiasedLocking
|
||||
-XX:+UseFastAccessorMethods
|
||||
-XX:+OptimizeStringConcat
|
||||
-XX:+HeapDumpOnOutOfMemoryError
|
||||
</argLine.common>
|
||||
<!-- Default to ALPN. See forcenpn profile to force NPN -->
|
||||
@ -466,7 +476,7 @@
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>2.7.2</version>
|
||||
<version>2.18.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -162,7 +162,7 @@ public class SocketSslClientRenegotiateTest extends AbstractSocketTest {
|
||||
Future<Channel> clientHandshakeFuture = clientSslHandler.handshakeFuture();
|
||||
clientHandshakeFuture.sync();
|
||||
|
||||
String renegotiation = "SSL_RSA_WITH_3DES_EDE_CBC_SHA";
|
||||
String renegotiation = clientSslHandler.engine().getSupportedCipherSuites()[0];
|
||||
clientSslHandler.engine().setEnabledCipherSuites(new String[] { renegotiation });
|
||||
clientSslHandler.renegotiate().await();
|
||||
serverChannel.close().awaitUninterruptibly();
|
||||
|
Loading…
Reference in New Issue
Block a user