Fix for Java distribution tests and JDK 17+
This commit is contained in:
parent
60fd7e63d9
commit
b96328868c
4 changed files with 20 additions and 14 deletions
|
@ -20,7 +20,19 @@
|
|||
</modules>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<ant.jvm.args>-Dnone</ant.jvm.args>
|
||||
</properties>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>jdk17+</id>
|
||||
<activation>
|
||||
<jdk>[17,)</jdk>
|
||||
</activation>
|
||||
<properties>
|
||||
<!--For more information, see https://github.com/apache/ant/pull/200-->
|
||||
<ant.jvm.args>-Djava.security.manager=allow</ant.jvm.args>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
|
@ -15,9 +15,6 @@
|
|||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
|
||||
<keycloak.osgi.export>
|
||||
org.keycloak.adapters.undertow.*
|
||||
</keycloak.osgi.export>
|
||||
|
@ -109,7 +106,8 @@
|
|||
<configuration>
|
||||
<target>
|
||||
<property name="plugin_classpath" refid="maven.plugin.classpath" />
|
||||
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer">
|
||||
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer" fork="true">
|
||||
<jvmarg value="${ant.jvm.args}"/>
|
||||
<arg value="-o" />
|
||||
<arg value="${jakarta-transformer-sources}" />
|
||||
<arg value="${jakarta-transformer-target}/tmp" />
|
||||
|
|
|
@ -15,9 +15,6 @@
|
|||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
|
||||
<jakarta-transformer-sources>${project.basedir}/../../../../../adapters/saml/undertow</jakarta-transformer-sources>
|
||||
<jakarta-transformer-target>${project.basedir}</jakarta-transformer-target>
|
||||
</properties>
|
||||
|
@ -99,7 +96,8 @@
|
|||
<configuration>
|
||||
<target>
|
||||
<property name="plugin_classpath" refid="maven.plugin.classpath" />
|
||||
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer">
|
||||
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer" fork="true">
|
||||
<jvmarg value="${ant.jvm.args}"/>
|
||||
<arg value="-o" />
|
||||
<arg value="${jakarta-transformer-sources}" />
|
||||
<arg value="${jakarta-transformer-target}/tmp" />
|
||||
|
|
|
@ -14,9 +14,6 @@
|
|||
<name>Adapter Undertow SPI (JakartaEE)</name>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
|
||||
<undertow-adapter-base>${project.basedir}/../../../../../adapters/spi/undertow-adapter-spi</undertow-adapter-base>
|
||||
<jakarta-transformer-sources>${undertow-adapter-base}/src/main/java/org/keycloak/adapters/undertow/</jakarta-transformer-sources>
|
||||
<jakarta-transformer-target>${project.basedir}/src/main/java/org/keycloak/adapters/undertow/</jakarta-transformer-target>
|
||||
|
@ -55,7 +52,8 @@
|
|||
<configuration>
|
||||
<target>
|
||||
<property name="plugin_classpath" refid="maven.plugin.classpath" />
|
||||
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer">
|
||||
<java classname="org.eclipse.transformer.jakarta.JakartaTransformer" fork="true">
|
||||
<jvmarg value="${ant.jvm.args}"/>
|
||||
<arg value="-o" />
|
||||
<arg value="${jakarta-transformer-sources}" />
|
||||
<arg value="${jakarta-transformer-target}/tmp" />
|
||||
|
|
Loading…
Reference in a new issue