Skip to content

Commit cde369c

Browse files
committed
Update GitHub Actions Java versions
Test with Java 8, 11, 13, 16 and 17-ea Update Lombok to latest version for tests to work on Java 16+
1 parent 482329c commit cde369c

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on: [push, pull_request]
44

55
env:
66
MAVEN_ARGS: >-
7-
-V -B
7+
-V -B --no-transfer-progress
88
-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
99
1010
jobs:
1111
linux_maven:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
java: [8, 11, 13, 14-ea, 15-ea]
15+
java: [8, 11, 13, 16, 17-ea]
1616
name: 'Linux JDK ${{ matrix.java }} Maven'
1717
runs-on: ubuntu-latest
1818
steps:

mapstruct-lombok/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99

1010
ext {
1111
mapstructVersion = "1.4.2.Final"
12-
lombokVersion = "1.18.16"
12+
lombokVersion = "1.18.20"
1313
lombokMapstructBindingVersion = "0.2.0"
1414
}
1515

mapstruct-lombok/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<maven.compiler.source>1.8</maven.compiler.source>
2020
<maven.compiler.target>1.8</maven.compiler.target>
2121
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
22-
<org.projectlombok.version>1.18.16</org.projectlombok.version>
22+
<org.projectlombok.version>1.18.20</org.projectlombok.version>
2323
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
2424
</properties>
2525

mapstruct-record/pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22-
<java.version>14</java.version>
22+
<java.version>16</java.version>
2323
<maven.compiler.source>${java.version}</maven.compiler.source>
2424
<maven.compiler.target>${java.version}</maven.compiler.target>
2525
<maven.compiler.release>${java.version}</maven.compiler.release>
@@ -61,38 +61,31 @@
6161
<artifactId>maven-compiler-plugin</artifactId>
6262
<version>3.8.0</version>
6363
<configuration>
64-
<compilerArgs>--enable-preview</compilerArgs>
6564
<annotationProcessorPaths>
6665
<path>
6766
<groupId>org.mapstruct</groupId>
6867
<artifactId>mapstruct-processor</artifactId>
6968
<version>${org.mapstruct.version}</version>
7069
</path>
7170
</annotationProcessorPaths>
72-
<source>14</source>
73-
<target>14</target>
7471
</configuration>
7572
</plugin>
7673
<plugin>
7774
<groupId>org.apache.maven.plugins</groupId>
7875
<artifactId>maven-surefire-plugin</artifactId>
7976
<version>3.0.0-M4</version>
80-
<configuration>
81-
<forkCount>1</forkCount>
82-
<argLine>--enable-preview</argLine>
83-
</configuration>
8477
</plugin>
8578
</plugins>
8679
</build>
8780

8881
<profiles>
8982
<profile>
90-
<id>java15</id>
83+
<id>java17</id>
9184
<activation>
92-
<jdk>15</jdk>
85+
<jdk>17-ea</jdk>
9386
</activation>
9487
<properties>
95-
<java.version>15</java.version>
88+
<java.version>17</java.version>
9689
</properties>
9790
</profile>
9891
</profiles>

0 commit comments

Comments
 (0)