Skip to content

Commit b719a3b

Browse files
authored
add jdk distribution to the matrix (#130)
* add jdk distribution to the matrix Signed-off-by: olivier lamy <olamy@apache.org> * add jdk 16 Signed-off-by: olivier lamy <olamy@apache.org> * add jdk 17-ea Signed-off-by: olivier lamy <olamy@apache.org> * error prone its not working on java16 Signed-off-by: olivier lamy <olamy@apache.org> * make this works with java 16 Signed-off-by: olivier lamy <olamy@apache.org> * use java range for profile Signed-off-by: olivier lamy <olamy@apache.org>
1 parent 28684f7 commit b719a3b

File tree

5 files changed

+51
-4
lines changed

5 files changed

+51
-4
lines changed

.github/workflows/maven.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
strategy:
2626
matrix:
2727
os: [ubuntu-latest,windows-latest, macOS-latest]
28-
java: [8, 11, 14, 15]
28+
java: [8, 11, 14, 15, 16, 17-ea]
29+
jdk: [adopt, zulu]
2930
fail-fast: false
3031

3132
runs-on: ${{ matrix.os }}
@@ -44,8 +45,9 @@ jobs:
4445
maven-${{ matrix.os }}-
4546
4647
- name: Set up JDK
47-
uses: actions/setup-java@v1
48+
uses: actions/setup-java@v2
4849
with:
50+
distribution: ${{ matrix.jdk }}
4951
java-version: ${{ matrix.java }}
5052

5153
- name: Build with Maven

plexus-compiler-its/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<goal>clean</goal>
5050
<goal>test-compile</goal>
5151
</goals>
52+
<scriptVariables>
53+
<errorprone.version>${errorprone.version}</errorprone.version>
54+
</scriptVariables>
5255
</configuration>
5356
</execution>
5457
</executions>

plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<path>
6060
<groupId>com.google.errorprone</groupId>
6161
<artifactId>error_prone_core</artifactId>
62-
<version>2.4.0</version>
62+
<version>@errorprone.version@</version>
6363
</path>
6464
</annotationProcessorPaths>
6565
</configuration>
@@ -87,5 +87,46 @@
8787
</plugins>
8888
</build>
8989
</profile>
90+
<profile>
91+
<id>jdk16</id>
92+
<activation>
93+
<jdk>[16,)</jdk>
94+
</activation>
95+
<build>
96+
<plugins>
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-compiler-plugin</artifactId>
100+
<configuration>
101+
<source>8</source>
102+
<target>8</target>
103+
<encoding>UTF-8</encoding>
104+
<fork>true</fork>
105+
<compilerArgs>
106+
<arg>-XDcompilePolicy=simple</arg>
107+
<arg>-Xplugin:ErrorProne</arg>
108+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
109+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
110+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
111+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
112+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
113+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
114+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
115+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
116+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
117+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
118+
</compilerArgs>
119+
<annotationProcessorPaths>
120+
<path>
121+
<groupId>com.google.errorprone</groupId>
122+
<artifactId>error_prone_core</artifactId>
123+
<version>@errorprone.version@</version>
124+
</path>
125+
</annotationProcessorPaths>
126+
</configuration>
127+
</plugin>
128+
</plugins>
129+
</build>
130+
</profile>
90131
</profiles>
91132
</project>

plexus-compilers/plexus-compiler-javac-errorprone/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.google.errorprone</groupId>
3131
<artifactId>error_prone_core</artifactId>
32-
<version>2.4.0</version>
32+
<version>${errorprone.version}</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.codehaus.plexus</groupId>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<javaVersion>7</javaVersion>
4747
<redirectTestOutputToFile>true</redirectTestOutputToFile>
4848
<project.build.outputTimestamp>2020-08-24T00:30:49Z</project.build.outputTimestamp>
49+
<errorprone.version>2.6.0</errorprone.version>
4950
</properties>
5051

5152
<dependencyManagement>

0 commit comments

Comments
 (0)