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

#3473 Add Java 21 and EA to build matrix

Browse Source 
Fix tests not running green on Java 21
Update Spring to run correctly on Java 21
This commit is contained in:
Filip Hrisafov 2023-12-18 07:35:26 +01:00 committed by GitHub
parent fa857e9ff4
commit 6d99f7b8f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,9 @@ jobs:
- name: 'Checkout'
uses: actions/checkout@v3
- name: 'Set up JDK'
uses: actions/setup-java@v3
uses: oracle-actions/setup-java@v1
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
website: jdk.java.net
release: EA
- name: 'Test'
run: ./mvnw ${MAVEN_ARGS} -Djacoco.skip=true install -DskipDistribution=true

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

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

4
parent/pom.xml
View File

@ -25,7 +25,7 @@
<org.apache.maven.plugins.enforcer.version>3.4.1</org.apache.maven.plugins.enforcer.version>
<org.apache.maven.plugins.surefire.version>3.2.2</org.apache.maven.plugins.surefire.version>
<org.apache.maven.plugins.javadoc.version>3.1.0</org.apache.maven.plugins.javadoc.version>
<org.springframework.version>5.3.18</org.springframework.version>
<org.springframework.version>5.3.31</org.springframework.version>
<org.eclipse.tycho.compiler-jdt.version>1.6.0</org.eclipse.tycho.compiler-jdt.version>
<com.puppycrawl.tools.checkstyle.version>8.36.1</com.puppycrawl.tools.checkstyle.version>
<org.junit.jupiter.version>5.10.1</org.junit.jupiter.version>
@ -576,7 +576,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.11</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>

9
processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
View File

@ -14,7 +14,6 @@ import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.LocalTime;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import org.junitpioneer.jupiter.DefaultLocale;
import org.mapstruct.ap.testutil.IssueKey;
@ -72,7 +71,7 @@ public class JodaConversionTest {
}
@ProcessorTest
@EnabledOnJre(JRE.JAVA_8)
@EnabledForJreRange(min = JRE.JAVA_21)
// See https://bugs.openjdk.java.net/browse/JDK-8211262, there is a difference in the default formats on Java 9+
public void testSourceToTargetMappingForStrings() {
Source src = new Source();
@ -93,14 +92,14 @@ public class JodaConversionTest {
// and now with default mappings
target = SourceTargetMapper.INSTANCE.sourceToTargetDefaultMapping( src );
assertThat( target ).isNotNull();
assertThat( target.getDateTime() ).isEqualTo( "1. Januar 2014 00:00:00 UTC" );
assertThat( target.getLocalDateTime() ).isEqualTo( "1. Januar 2014 00:00:00" );
assertThat( target.getDateTime() ).isEqualTo( "1. Januar 2014, 00:00:00 UTC" );
assertThat( target.getLocalDateTime() ).isEqualTo( "1. Januar 2014, 00:00:00" );
assertThat( target.getLocalDate() ).isEqualTo( "1. Januar 2014" );
assertThat( target.getLocalTime() ).isEqualTo( "00:00:00" );
}
@ProcessorTest
@EnabledForJreRange(min = JRE.JAVA_11)
@EnabledForJreRange(min = JRE.JAVA_11, max = JRE.JAVA_17)
// See https://bugs.openjdk.java.net/browse/JDK-8211262, there is a difference in the default formats on Java 9+
public void testSourceToTargetMappingForStringsJdk11() {
Source src = new Source();