Update integration tests to support Java 17+, build to support 23 (#246)

Also added new CI permutations to verify commits on Java 17 and 23. Fixes #159 Fixes #129
Vertispan · Nov 27, 2023 · 3a4b1ff · 3a4b1ff
1 parent 1e27b91
commit 3a4b1ff
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,16 +39,15 @@ jobs:
       matrix:
         mvn: ['3.9.5', '3.8.8', '3.6.3', '3.5.4', '3.3.9', '3.2.5']
         java: ['11']
-#        include: # Confirm that old java works in the oldest maven, and that newest maven supports 8-current
-#            #TODO j2clmavenplugin#159 - re-enable this when the integration tests run cleanly in Java 17+
-#          - mvn: '3.8.8'
-#            java: '17'
-#          - mvn: '3.8.8'
-#            java: '21'
-#          - mvn: '3.9.5'
-#            java: '17'
-#          - mvn: '3.9.5'
-#            java: '21'
+        include: # Confirm that old java works in the oldest maven, and that newest maven supports 11-current
+          - mvn: '3.8.8'
+            java: '17'
+          - mvn: '3.8.8'
+            java: '21'
+          - mvn: '3.9.5'
+            java: '17'
+          - mvn: '3.9.5'
+            java: '21'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/j2cl-maven-plugin/src/it/annotation-processor-in-reactor/app/pom.xml b/j2cl-maven-plugin/src/it/annotation-processor-in-reactor/app/pom.xml
@@ -83,6 +83,11 @@
                         <target>1.8</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/j2cl-maven-plugin/src/it/dependency-replacements/app/pom.xml b/j2cl-maven-plugin/src/it/dependency-replacements/app/pom.xml
@@ -48,6 +48,11 @@
             <target>1.8</target>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.3.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

diff --git a/j2cl-maven-plugin/src/it/hello-world-reactor/app/pom.xml b/j2cl-maven-plugin/src/it/hello-world-reactor/app/pom.xml
@@ -32,5 +32,14 @@
                 </executions>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 </project>
diff --git a/j2cl-maven-plugin/src/it/hello-world-single/pom.xml b/j2cl-maven-plugin/src/it/hello-world-single/pom.xml
@@ -40,6 +40,11 @@
                         <target>1.8</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/j2cl-maven-plugin/src/it/hello-world-web-components/pom.xml b/j2cl-maven-plugin/src/it/hello-world-web-components/pom.xml
@@ -55,6 +55,11 @@
             <target>1.8</target>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.3.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

diff --git a/j2cl-maven-plugin/src/it/top-level-source-file/pom.xml b/j2cl-maven-plugin/src/it/top-level-source-file/pom.xml
@@ -40,6 +40,11 @@
                         <target>1.8</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/j2cl-maven-plugin/src/it/transitive-dependencies/app/pom.xml b/j2cl-maven-plugin/src/it/transitive-dependencies/app/pom.xml
@@ -43,6 +43,11 @@
             <target>1.8</target>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.3.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,7 @@
     <!-- Plugin dependencies versions-->
     <maven.version>3.3.9</maven.version>
     <maven.resolver.version>1.3.1</maven.resolver.version>
-    <maven.enforcer.plugin.version>1.4.1</maven.enforcer.plugin.version>
+    <maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
     <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
     <maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
     <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>