Skip to content

Commit

Permalink
[ELY-2514] Move JDK9 classes to single package, remove JDK 8 build co…
Browse files Browse the repository at this point in the history 
…nfigurations
  • Loading branch information
@cam-rod
cam-rod committed May 19, 2023
1 parent ce74ab4 commit 1bd7d1f
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 589 deletions.
58 changes: 0 additions & 58 deletions manager/base/pom.xml
View file
Expand Up @@ -35,64 +35,6 @@
<name>WildFly Elytron - Security Manager</name>
<description>WildFly Security Security Manager</description>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0-jboss-1</version>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>8</release>
<buildDirectory>${project.build.directory}</buildDirectory>
<compileSourceRoots>${project.compileSourceRoots}</compileSourceRoots>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/jdk-misc.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
<execution>
<id>compile-java9</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<buildDirectory>${project.build.directory}</buildDirectory>
<compileSourceRoots>${project.basedir}/src/main/java9</compileSourceRoots>
<outputDirectory>${project.build.directory}/classes/META-INF/versions/9</outputDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${version.jar.plugin}</version>
<configuration>
<archive>
<manifestEntries>
<Multi-Release>true</Multi-Release>
<Jar-Version>${project.version}</Jar-Version>
<Jar-Name>${project.artifactId}</Jar-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.wildfly.security</groupId>
Expand Down
0 ...wildfly/security/manager/JDKSpecific.java → ...wildfly/security/manager/JDKSpecific.java
View file
File renamed without changes.
106 changes: 4 additions & 102 deletions pom.xml
View file
Expand Up @@ -106,8 +106,10 @@
<linkXRef>false</linkXRef>

<!-- Modularized JDK support (various workarounds) - activated via profile -->
<modular.jdk.args/>
<modular.jdk.props/>
<!-- [WFCORE-1431] remove SASL workaround -->
<modular.jdk.args>--add-modules java.sql --illegal-access=permit</modular.jdk.args>
<!-- use version of jboss-logging that works much better with JDK9 -->
<modular.jdk.props>-Djdk.attach.allowAttachSelf=true</modular.jdk.props>
</properties>

<build>
Expand Down Expand Up @@ -195,17 +197,6 @@
<reuseForks>false</reuseForks>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<classesDirectory>${project.build.directory}/classes/META-INF/versions/9</classesDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/classes</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
Expand Down Expand Up @@ -296,7 +287,6 @@
${project.basedir}/json-util/src/main/java/;
${project.basedir}/keystore/src/main/java/;
${project.basedir}/manager/action/src/main/java/;
${project.basedir}/manager/base/src/main/java9/; <!--java9/ must be before java/-->
${project.basedir}/manager/base/src/main/java/;
${project.basedir}/mechanism/base/src/main/java/;
${project.basedir}/mechanism/digest/src/main/java/;
Expand All @@ -320,7 +310,6 @@
${project.basedir}/sasl/otp/src/main/java/;
${project.basedir}/sasl/plain/src/main/java/;
${project.basedir}/sasl/scram/src/main/java/;
${project.basedir}/ssl/src/main/java9/;
${project.basedir}/ssl/src/main/java/;
${project.basedir}/tests/base/src/main/java/;
${project.basedir}/tests/common/src/main/java/;
Expand Down Expand Up @@ -1242,21 +1231,6 @@
</dependencyManagement>

<profiles>
<profile>
<id>modularizedJdk</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<!-- [WFCORE-1431] remove SASL workaround -->
<modular.jdk.args>--add-modules java.sql --illegal-access=permit</modular.jdk.args>
<!-- use version of jboss-logging that works much better with JDK9 -->
<modular.jdk.props>-Djdk.attach.allowAttachSelf=true</modular.jdk.props>
<!-- 2.20.x doesn't start on JDK10-->
<version.surefire.plugin>2.19.1</version.surefire.plugin>
</properties>
</profile>

<profile>
<id>skip-default-tests</id>
<build>
Expand All @@ -1273,78 +1247,6 @@
</plugins>
</build>
</profile>
<profile>
<id>java8-test-profile</id>
<activation>
<property>
<name>java8.home</name>
</property>
</activation>
<properties>
<modular.jdk.args/>
<modular.jdk.props/>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>java8-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports/java8</reportsDirectory>
<jvm>${java8.home}/bin/java</jvm>
<additionalClasspathElements>
<additionalClasspathElement>${java8.home}/lib/tools.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>java9-test-profile</id>
<activation>
<property>
<name>java9.home</name>
</property>
</activation>
<properties>
<modular.jdk.args/>
<modular.jdk.props/>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>java9-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports/java9</reportsDirectory>
<jvm>${java9.home}/bin/java</jvm>
<classesDirectory>${project.build.directory}/classes/META-INF/versions/9</classesDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
<additionalClasspathElement>${java9.home}/lib/tools.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
Expand Down
58 changes: 0 additions & 58 deletions ssl/pom.xml
View file
Expand Up @@ -34,64 +34,6 @@
<name>WildFly Elytron - SSL</name>
<description>WildFly Security SSL</description>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0-jboss-1</version>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>8</release>
<buildDirectory>${project.build.directory}</buildDirectory>
<compileSourceRoots>${project.compileSourceRoots}</compileSourceRoots>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/jdk-misc.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
<execution>
<id>compile-java9</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<buildDirectory>${project.build.directory}</buildDirectory>
<compileSourceRoots>${project.basedir}/src/main/java9</compileSourceRoots>
<outputDirectory>${project.build.directory}/classes/META-INF/versions/9</outputDirectory>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${version.jar.plugin}</version>
<configuration>
<archive>
<manifestEntries>
<Multi-Release>true</Multi-Release>
<Jar-Version>${project.version}</Jar-Version>
<Jar-Name>${project.artifactId}</Jar-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.wildfly.security</groupId>
Expand Down
0 ...org/wildfly/security/ssl/JDKSpecific.java → ...org/wildfly/security/ssl/JDKSpecific.java
View file
File renamed without changes.

0 comments on commit 1bd7d1f

Please sign in to comment.