third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#2466 Update dependencies so tests run on Java 16+

Browse Source 
Update GitHub Actions for tests to run on Java 11, 13, 16 and 17-ea.
Update Lombok so tests can run on 16+
Add jaxb-runtime dependency to the maven-jaxb2-plugin see https://github.com/highsource/maven-jaxb2-plugin/issues/148
Disable cdi integration test on Java 16+ until we find a solution for them
This commit is contained in:
Filip Hrisafov 2021-06-05 09:22:37 +02:00
parent 70ea65f7aa
commit 857f87276f
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/java-ea.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [16-ea] java: [17-ea]
name: 'Linux JDK ${{ matrix.java }}' name: 'Linux JDK ${{ matrix.java }}'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

2
.github/workflows/main.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
java: [11, 13, 15] java: [11, 13, 16]
name: 'Linux JDK ${{ matrix.java }}' name: 'Linux JDK ${{ matrix.java }}'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

2
integrationtest/src/test/java/org/mapstruct/itest/tests/MavenIntegrationTest.java
View File

@ -5,6 +5,7 @@
*/ */
package org.mapstruct.itest.tests; package org.mapstruct.itest.tests;
import org.junit.jupiter.api.condition.DisabledForJreRange;
import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.Execution;
@ -25,6 +26,7 @@ public class MavenIntegrationTest {
} }
@ProcessorTest(baseDir = "cdiTest") @ProcessorTest(baseDir = "cdiTest")
@DisabledForJreRange(min = JRE.JAVA_16)
void cdiTest() { void cdiTest() {
} }

7
integrationtest/src/test/resources/jaxbTest/pom.xml
View File

@ -47,6 +47,13 @@
<verbose>true</verbose> <verbose>true</verbose>
<specVersion>2.1</specVersion> <specVersion>2.1</specVersion>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

2
parent/pom.xml
View File

@ -202,7 +202,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.16</version> <version>1.18.20</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.immutables</groupId> <groupId>org.immutables</groupId>