Be able to build on JDK17 (#11500)
Motivation:
As the release of JDK17 is getting closer and there are ea builds already we should ensure we can actually build netty with it.
Modifications:
- Add profile for JDK17
- Remove test-code that would fail with JDK17 due the changes in 4f4d0f5366
.
Result:
Be able to build and run testsuite with JDK17
This commit is contained in:
parent
6c4c8fd6d4
commit
119f34889d
@ -1105,7 +1105,6 @@ public class OpenSslEngineTest extends SSLEngineTest {
|
|||||||
SSLParameters parameters = new SSLParameters();
|
SSLParameters parameters = new SSLParameters();
|
||||||
Java8SslTestUtils.setSNIMatcher(parameters, name);
|
Java8SslTestUtils.setSNIMatcher(parameters, name);
|
||||||
engine.setSSLParameters(parameters);
|
engine.setSSLParameters(parameters);
|
||||||
assertTrue(unwrapEngine(engine).checkSniHostnameMatch(name));
|
|
||||||
assertFalse(unwrapEngine(engine).checkSniHostnameMatch("other".getBytes(CharsetUtil.UTF_8)));
|
assertFalse(unwrapEngine(engine).checkSniHostnameMatch("other".getBytes(CharsetUtil.UTF_8)));
|
||||||
} finally {
|
} finally {
|
||||||
cleanupServerSslEngine(engine);
|
cleanupServerSslEngine(engine);
|
||||||
|
24
pom.xml
24
pom.xml
@ -182,6 +182,30 @@
|
|||||||
<testJvm/>
|
<testJvm/>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>java17</id>
|
||||||
|
<activation>
|
||||||
|
<jdk>17</jdk>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<!-- Not use alpn agent as Java11+ supports alpn out of the box -->
|
||||||
|
<argLine.alpnAgent />
|
||||||
|
<argLine.java9.extras />
|
||||||
|
<!-- Export some stuff which is used during our tests -->
|
||||||
|
<argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
|
||||||
|
<forbiddenapis.skip>true</forbiddenapis.skip>
|
||||||
|
<!-- Needed because of https://issues.apache.org/jira/browse/MENFORCER-275 -->
|
||||||
|
<enforcer.plugin.version>3.0.0-M3</enforcer.plugin.version>
|
||||||
|
<!-- 1.4.x does not work in Java10+ -->
|
||||||
|
<jboss.marshalling.version>2.0.5.Final</jboss.marshalling.version>
|
||||||
|
<!-- This is the minimum supported by Java12+ -->
|
||||||
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
|
<maven.compiler.target>1.7</maven.compiler.target>
|
||||||
|
<!-- pax-exam does not work on latest Java12 EA 22 build -->
|
||||||
|
<skipOsgiTestsuite>true</skipOsgiTestsuite>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
|
||||||
<!-- JDK16 -->
|
<!-- JDK16 -->
|
||||||
<profile>
|
<profile>
|
||||||
<id>java16</id>
|
<id>java16</id>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user