From 35e2074a56a73c16dff71192d599c64880c66fbf Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Sat, 23 Mar 2024 10:13:02 -0500
Subject: [PATCH] Fixes #3682 - Add Java 22 to build matrix (#3685)

---
 .github/workflows/build.yml                   |  5 +-
 http/virtual/pom.xml                          | 91 +++++++++++++------
 .../springboot-virtualthreads/pom.xml         | 47 ++++++++--
 3 files changed, 107 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e1712e1aee..e72a2008b5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,16 +14,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        java: [ 21, 22 ]
         os: [ubuntu-latest, windows-latest]
     steps:
     - name: Checkout Sources
       uses: actions/checkout@v3
-    - name: Setup Java 21
+    - name: Setup Java
       uses: actions/setup-java@v3
       with:
         cache: 'maven'
         distribution: 'temurin'
-        java-version: 21
+        java-version: ${{ matrix.java }}
     - name: Build with Maven
       run: mvn --no-transfer-progress -B install
     - name: Publish Unit Test Results
diff --git a/http/virtual/pom.xml b/http/virtual/pom.xml
index 36b7b1bcb8..476099d276 100644
--- a/http/virtual/pom.xml
+++ b/http/virtual/pom.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <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>
-
     <parent>
         <groupId>cloud.piranha.http</groupId>
         <artifactId>project</artifactId>
         <version>24.4.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>piranha-http-virtual</artifactId>
     <name>Piranha - HTTP - Virtual Threads implementation</name>
-
     <dependencies>
         <dependency>
             <groupId>cloud.piranha.http</groupId>
@@ -26,30 +24,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <release>${java.version}</release>
-                    <enablePreview>true</enablePreview>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <configuration>
-                            <additionalOptions>--enable-preview</additionalOptions>
-                            <release>${java.version}</release>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -59,5 +35,68 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>jdk21</id>
+            <activation>
+                <jdk>21</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <release>${java.version}</release>
+                            <enablePreview>true</enablePreview>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <configuration>
+                                    <additionalOptions>--enable-preview</additionalOptions>
+                                    <release>${java.version}</release>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk22</id>
+            <activation>
+                <jdk>22</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <release>22</release>
+                            <enablePreview>true</enablePreview>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <configuration>
+                                    <additionalOptions>--enable-preview</additionalOptions>
+                                    <release>22</release>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/test/embedded/springboot-virtualthreads/pom.xml b/test/embedded/springboot-virtualthreads/pom.xml
index b967db0dbd..dc87dd0ff8 100644
--- a/test/embedded/springboot-virtualthreads/pom.xml
+++ b/test/embedded/springboot-virtualthreads/pom.xml
@@ -50,14 +50,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <release>${java.version}</release>
-                    <enablePreview>true</enablePreview>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -68,4 +60,43 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk21</id>
+            <activation>
+                <jdk>21</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <release>${java.version}</release>
+                            <enablePreview>true</enablePreview>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk22</id>
+            <activation>
+                <jdk>22</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <release>22</release>
+                            <enablePreview>true</enablePreview>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
 </project>