From c9f872645e494fd0785aa4df8b69737b4872c43d Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 15 Oct 2024 09:34:51 -0500
Subject: [PATCH] Add "tip" JDK configuration

Fixes #357
---
 .github/workflows/build.yml | 22 ++++++------
 pom.xml                     | 70 +++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f67de7c..894daea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,8 @@ jobs:
           java-version: |
             11
             17
+            21
+            23
 
       - name: Install the parent POM snapshot
         run: |
@@ -47,14 +49,14 @@ jobs:
           cd wildfly-common
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Test WildFly Common for no regression of #253
         run: |
           cd wildfly-common
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp package install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp package install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out WildFly Maven Plugin
         uses: actions/checkout@v4
@@ -67,7 +69,7 @@ jobs:
           cd wildfly-maven-plugin
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out JBoss Modules
         uses: actions/checkout@v4
@@ -80,7 +82,7 @@ jobs:
           cd jboss-modules
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out JBoss Marshalling
         uses: actions/checkout@v4
@@ -93,7 +95,7 @@ jobs:
           cd jboss-marshalling
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out JBoss Logging Dev Tools
         uses: actions/checkout@v4
@@ -106,7 +108,7 @@ jobs:
           cd logging-dev-tools
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out JBoss LogManager
         uses: actions/checkout@v4
@@ -119,7 +121,7 @@ jobs:
           cd jboss-logmanager
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out JBoss Logging
         uses: actions/checkout@v4
@@ -132,7 +134,7 @@ jobs:
           cd jboss-logging
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out JBoss Logging Tools
         uses: actions/checkout@v4
@@ -145,7 +147,7 @@ jobs:
           cd jboss-logging-tools
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
 
       - name: Check out Log4j2 to JBoss LogManager bridge
         uses: actions/checkout@v4
@@ -158,4 +160,4 @@ jobs:
           cd log4j2-jboss-logmanager
           mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
           git diff pom.xml
-          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}}
+          mvn -B -ntp install -Djava11.home=${{env.JAVA_HOME_11_X64}} -Djava17.home=${{env.JAVA_HOME_17_X64}} -Djava21.home=${{env.JAVA_HOME_21_X64}}
diff --git a/pom.xml b/pom.xml
index b7966e2..37f1acc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1810,5 +1810,75 @@
                 </plugins>
             </build>
         </profile>
+
+        <!-- This profile is activated when the baseline JDK version running tests is Java 23 -->
+        <profile>
+            <id>java23-test-classpath</id>
+            <activation>
+                <jdk>[23,24)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>default-test</id>
+                                <configuration>
+                                    <classesDirectory>${project.build.outputDirectory}/META-INF/versions/23
+                                    </classesDirectory>
+                                    <additionalClasspathElements>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/22
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/21
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/20
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/19
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/18
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/17
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/16
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/15
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/14
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/13
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>
+                                            ${project.build.directory}/classes/META-INF/versions/12
+                                        </additionalClasspathElement>
+                                        <additionalClasspathElement>${project.build.outputDirectory}
+                                        </additionalClasspathElement>
+                                    </additionalClasspathElements>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
+
+    <!--
+     * When adding new layers:
+     *   1. Copy the javaXX-mr-build profile for the new version
+     *   2. Copy the javaXX-test-classpath profile for the new version, make sure it is updated for the new version
+     *   3. If LTS, copy the javaXX-test profile for the new version
+    -->
+
 </project>