Add profile to build on JDK 14 (#10148)
Motivation: JDK 14 was released and need some special settings to be able to build with. Also there seems to be one regression that we need to workaround for now. Modifications: - Add maven profile for JDK 14 - Update blockhound version to be able to work on JDK 14 - Add workaround for possible JDK 14 regression Result: Be able to build on JDK 14
This commit is contained in:
parent
9f5970a91a
commit
ff9667b1f9
@ -2990,7 +2990,12 @@ public abstract class SSLEngineTest {
|
||||
assertTrue(serverSession.getPacketBufferSize() > 0);
|
||||
|
||||
assertNotNull(clientSession.getSessionContext());
|
||||
|
||||
// Workaround for possible JDK 14 regression.
|
||||
// See http://mail.openjdk.java.net/pipermail/security-dev/2020-March/021488.html
|
||||
if (PlatformDependent.javaVersion() < 14) {
|
||||
assertNotNull(serverSession.getSessionContext());
|
||||
}
|
||||
|
||||
Object value = new Object();
|
||||
|
||||
|
34
pom.xml
34
pom.xml
@ -97,6 +97,24 @@
|
||||
<testJvm/>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- JDK14 -->
|
||||
<profile>
|
||||
<id>java14</id>
|
||||
<activation>
|
||||
<jdk>14</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- Not use alpn agent as Java11+ 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-M3</enforcer.plugin.version>
|
||||
<!-- 1.4.x does not work in Java10+ -->
|
||||
<jboss.marshalling.version>2.0.5.Final</jboss.marshalling.version>
|
||||
<!-- pax-exam does not work on latest Java12 EA 22 build -->
|
||||
<skipOsgiTestsuite>true</skipOsgiTestsuite>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- JDK13 -->
|
||||
<profile>
|
||||
<id>java13</id>
|
||||
@ -104,11 +122,11 @@
|
||||
<jdk>13</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- Not use alpn agent as Java11 supports alpn out of the box -->
|
||||
<!-- Not use alpn agent as Java11+ 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>
|
||||
<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>
|
||||
<!-- pax-exam does not work on latest Java12 EA 22 build -->
|
||||
@ -126,11 +144,11 @@
|
||||
<argLine.java9.extras />
|
||||
<!-- Export some stuff which is used during our tests -->
|
||||
<argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
|
||||
<!-- Not use alpn agent as Java11 supports alpn out of the box -->
|
||||
<!-- Not use alpn agent as Java11+ 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>
|
||||
<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>
|
||||
<!-- pax-exam does not work on latest Java12 EA 22 build -->
|
||||
@ -148,11 +166,11 @@
|
||||
<argLine.java9.extras />
|
||||
<!-- Export some stuff which is used during our tests -->
|
||||
<argLine.java9>--illegal-access=deny ${argLine.java9.extras}</argLine.java9>
|
||||
<!-- Not use alpn agent as Java11 supports alpn out of the box -->
|
||||
<!-- Not use alpn agent as Java11+ 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>
|
||||
<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>
|
||||
<!-- pax-exam does not work on latest Java11 build -->
|
||||
@ -174,7 +192,7 @@
|
||||
<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>
|
||||
<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>
|
||||
</properties>
|
||||
@ -661,7 +679,7 @@
|
||||
<dependency>
|
||||
<groupId>io.projectreactor.tools</groupId>
|
||||
<artifactId>blockhound</artifactId>
|
||||
<version>1.0.2.RELEASE</version>
|
||||
<version>1.0.3.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
@ -41,6 +41,15 @@
|
||||
<argLine.common>-XX:+AllowRedefinitionToAddDeleteMethods</argLine.common>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>java14</id>
|
||||
<activation>
|
||||
<jdk>14</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<argLine.common>-XX:+AllowRedefinitionToAddDeleteMethods</argLine.common>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<properties>
|
||||
|
Loading…
Reference in New Issue
Block a user