Skip to content

Commit 50626b9

Browse files
committed
Update integration tests to support Java 17+, build to support 23
Fixes Vertispan#159 Fixes Vertispan#129
1 parent 1e27b91 commit 50626b9

File tree

9 files changed

+45
-11
lines changed

9 files changed

+45
-11
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,15 @@ jobs:
3939
matrix:
4040
mvn: ['3.9.5', '3.8.8', '3.6.3', '3.5.4', '3.3.9', '3.2.5']
4141
java: ['11']
42-
# include: # Confirm that old java works in the oldest maven, and that newest maven supports 8-current
43-
# #TODO j2clmavenplugin#159 - re-enable this when the integration tests run cleanly in Java 17+
44-
# - mvn: '3.8.8'
45-
# java: '17'
46-
# - mvn: '3.8.8'
47-
# java: '21'
48-
# - mvn: '3.9.5'
49-
# java: '17'
50-
# - mvn: '3.9.5'
51-
# java: '21'
42+
include: # Confirm that old java works in the oldest maven, and that newest maven supports 11-current
43+
- mvn: '3.8.8'
44+
java: '17'
45+
- mvn: '3.8.8'
46+
java: '21'
47+
- mvn: '3.9.5'
48+
java: '17'
49+
- mvn: '3.9.5'
50+
java: '21'
5251
steps:
5352
- name: Checkout
5453
uses: actions/checkout@v4

j2cl-maven-plugin/src/it/annotation-processor-in-reactor/app/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@
8383
<target>1.8</target>
8484
</configuration>
8585
</plugin>
86+
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
88+
<artifactId>maven-war-plugin</artifactId>
89+
<version>3.3.2</version>
90+
</plugin>
8691
</plugins>
8792
</pluginManagement>
8893
</build>

j2cl-maven-plugin/src/it/dependency-replacements/app/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
<target>1.8</target>
4949
</configuration>
5050
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-war-plugin</artifactId>
54+
<version>3.3.2</version>
55+
</plugin>
5156
</plugins>
5257
</pluginManagement>
5358
</build>

j2cl-maven-plugin/src/it/hello-world-reactor/app/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
</execution>
3232
</executions>
3333
</plugin>
34+
<plugin>
35+
<groupId>org.apache.maven.plugins</groupId>
36+
<artifactId>maven-war-plugin</artifactId>
37+
<version>3.3.2</version>
38+
</plugin>
3439
</plugins>
3540
</build>
3641
</project>

j2cl-maven-plugin/src/it/hello-world-single/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<target>1.8</target>
4141
</configuration>
4242
</plugin>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-war-plugin</artifactId>
46+
<version>3.3.2</version>
47+
</plugin>
4348
</plugins>
4449
</pluginManagement>
4550
</build>

j2cl-maven-plugin/src/it/hello-world-web-components/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
<target>1.8</target>
5656
</configuration>
5757
</plugin>
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-war-plugin</artifactId>
61+
<version>3.3.2</version>
62+
</plugin>
5863
</plugins>
5964
</pluginManagement>
6065
</build>

j2cl-maven-plugin/src/it/top-level-source-file/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<target>1.8</target>
4141
</configuration>
4242
</plugin>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-war-plugin</artifactId>
46+
<version>3.3.2</version>
47+
</plugin>
4348
</plugins>
4449
</pluginManagement>
4550
</build>

j2cl-maven-plugin/src/it/transitive-dependencies/app/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@
4343
<target>1.8</target>
4444
</configuration>
4545
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-war-plugin</artifactId>
49+
<version>3.3.2</version>
50+
</plugin>
4651
</plugins>
4752
</pluginManagement>
4853
</build>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<!-- Plugin dependencies versions-->
8282
<maven.version>3.3.9</maven.version>
8383
<maven.resolver.version>1.3.1</maven.resolver.version>
84-
<maven.enforcer.plugin.version>1.4.1</maven.enforcer.plugin.version>
84+
<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
8585
<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
8686
<maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
8787
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>

0 commit comments

Comments
 (0)