WINDUP-3602 Support for jdk17-eap7 testing (#901)

* Support for jdk17-eap7 testing * Remove eap profile * WINDUP-3602 Aligned properties to the one used in the windup-web-distribution project (#43) * WINDUP-3602 Aligned properties to the one used in the windup-web-distribution project * WINDUP-3602 Set 'defaultStorageProvider' property * Remove space --------- Co-authored-by: Marco Rizzi <[email protected]>
windup · Apr 5, 2023 · 204d4eb · 204d4eb
1 parent 79cdc17
commit 204d4eb
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 96 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,10 @@
         <version.windup>6.2.0-SNAPSHOT</version.windup>
         <version.windup.cli>6.2.0-SNAPSHOT</version.windup.cli>
         <version.keycloak>18.0.2</version.keycloak>
+        <wildfly.groupId>org.wildfly</wildfly.groupId>
+        <wildfly.artifactId>wildfly-dist</wildfly.artifactId>
         <version.wildfly>23.0.2.Final</version.wildfly>
+        <wildfly.directory>wildfly-${version.wildfly}</wildfly.directory>
         <version.resteasy>3.15.1.Final</version.resteasy>
         <version.jboss.javaee>1.0.1.Final</version.jboss.javaee>
 
@@ -256,16 +259,6 @@
 
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=768m -XX:ReservedCodeCacheSize=128m</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -367,6 +360,42 @@
             </build>
         </profile>
 
+        <profile>
+            <id>surefire-jdk11</id>
+            <activation>
+                <jdk>11</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>-Xms512m -Xmx2048m -XX:ReservedCodeCacheSize=128m</argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>surefire-jdk17</id>
+            <activation>
+                <jdk>17</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>-Xms512m -Xmx2048m -XX:ReservedCodeCacheSize=128m --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+                            <reuseForks>false</reuseForks>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>windup</id>
             <activation>

diff --git a/services/src/test/resources/arquillian.xml b/services/src/test/resources/arquillian.xml
@@ -10,9 +10,9 @@
 
     <container qualifier="jbossas-managed" default="true">
         <configuration>
-            <property name="jbossHome">target/wildfly-${wildfly.version}</property>
+            <property name="jbossHome">target/server-dist</property>
             <property name="serverConfig">standalone-full.xml</property>
-            <property name="javaVmArguments">-Xms64m -Xmx2048m -Dorg.jboss.resolver.warning=true -Djboss.socket.binding.port-offset=100 -Djboss.node.name=windup-test-node ${server.jvm.args}</property>
+            <property name="javaVmArguments">-Xms64m -Xmx2048m -Dorg.jboss.resolver.warning=true -Djboss.socket.binding.port-offset=100 -Djboss.node.name=windup-test-node --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.stream=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED ${server.jvm.args}</property>
             <!--
             <property name="javaVmArguments">-Xms64m -Xmx2048m -Dorg.jboss.resolver.warning=true -Djboss.socket.binding.port-offset=100</property>
             <property name="javaVmArguments">-Xms64m -Xmx2048m -Dorg.jboss.resolver.warning=true -Djboss.socket.binding.port-offset=100 -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y</property>

diff --git a/tests/wildfly-dist/pom.xml b/tests/wildfly-dist/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <wildfly.outputdirectory>${basedir}/target/classes/wildfly-${version.wildfly}/</wildfly.outputdirectory>
+        <wildfly.outputdirectory>${basedir}/target/classes/server-dist/</wildfly.outputdirectory>
     </properties>
 
     <parent>
@@ -30,8 +30,8 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.wildfly</groupId>
-                                    <artifactId>wildfly-dist</artifactId>
+                                    <groupId>${wildfly.groupId}</groupId>
+                                    <artifactId>${wildfly.artifactId}</artifactId>
                                     <version>${version.wildfly}</version>
                                     <type>zip</type>
                                     <overWrite>false</overWrite>
@@ -50,6 +50,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>rename-windup-dist</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <move file="${project.build.directory}/classes/${wildfly.directory}" tofile="${project.build.directory}/classes/server-dist" />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.0.1</version>