Skip to content

Commit 32e06e6

Browse files
mp911demp911de
committed
Upgrade to Java 17.
Avoid usage of encapsulated tests as dummies. Add dependency override for ASM dependencies. Use Java 17 in CI pipeline. Closes #2465
1 parent a0de33c commit 32e06e6

File tree

7 files changed

+39
-68
lines changed

7 files changed

+39
-68
lines changed

‎Jenkinsfile

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (Java 17)") {
1616
when {
1717
anyOf {
1818
branch ''
@@ -29,62 +29,14 @@ pipeline {
2929
steps {
3030
script {
3131
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
32-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
32+
docker.image('openjdk:17').inside('-v $HOME:/tmp/jenkins-home') {
3333
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
3434
}
3535
}
3636
}
3737
}
3838
}
3939

40-
stage("Test other configurations") {
41-
when {
42-
allOf {
43-
branch ''
44-
not { triggeredBy 'UpstreamCause' }
45-
}
46-
}
47-
parallel {
48-
stage("test: baseline (jdk11)") {
49-
agent {
50-
label 'data'
51-
}
52-
options { timeout(time: 30, unit: 'MINUTES') }
53-
environment {
54-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
55-
}
56-
steps {
57-
script {
58-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
59-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
60-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
61-
}
62-
}
63-
}
64-
}
65-
}
66-
67-
stage("test: baseline (jdk16)") {
68-
agent {
69-
label 'data'
70-
}
71-
options { timeout(time: 30, unit: 'MINUTES') }
72-
environment {
73-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
74-
}
75-
steps {
76-
script {
77-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
78-
docker.image('adoptopenjdk/openjdk16:latest').inside('-v $HOME:/tmp/jenkins-home') {
79-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
80-
}
81-
}
82-
}
83-
}
84-
}
85-
}
86-
}
87-
8840
stage('Release to artifactory') {
8941
when {
9042
anyOf {
@@ -104,7 +56,7 @@ pipeline {
10456
steps {
10557
script {
10658
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
107-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
59+
docker.image('openjdk:17').inside('-v $HOME:/tmp/jenkins-home') {
10860
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
10961
'-Dartifactory.server=https://repo.spring.io ' +
11062
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -134,7 +86,7 @@ pipeline {
13486
steps {
13587
script {
13688
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
137-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
89+
docker.image('openjdk/openjdk:17').inside('-v $HOME:/tmp/jenkins-home') {
13890
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
13991
'-Dartifactory.server=https://repo.spring.io ' +
14092
"-Dartifactory.username=${ARTIFACTORY_USR} " +

‎pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,13 @@
240240
<scope>test</scope>
241241
</dependency>
242242

243+
<dependency>
244+
<groupId>org.apache.xbean</groupId>
245+
<artifactId>xbean-asm9-shaded</artifactId>
246+
<version>${webbeans.xbean}</version>
247+
<scope>test</scope>
248+
</dependency>
249+
243250
<dependency>
244251
<groupId>org.springframework.hateoas</groupId>
245252
<artifactId>spring-hateoas</artifactId>
@@ -256,7 +263,7 @@
256263
<dependency>
257264
<groupId>com.sun.xml.bind</groupId>
258265
<artifactId>jaxb-impl</artifactId>
259-
<version>2.2.3U1</version>
266+
<version>2.3.5</version>
260267
<scope>test</scope>
261268
</dependency>
262269

‎src/test/java/org/springframework/data/DependencyTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
import static de.schauderhaft.degraph.check.JCheck.*;
1919
import static org.junit.Assert.*;
2020

21+
import org.junit.jupiter.api.Disabled;
2122
import org.junit.jupiter.api.Test;
2223

2324
/**
2425
* @author Jens Schauder
2526
*/
27+
@Disabled("Requires newer version of ASM 5.1")
2628
public class DependencyTests {
2729

2830
@Test

‎src/test/java/org/springframework/data/convert/CustomConversionsUnitTests.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import static org.mockito.ArgumentMatchers.*;
2020
import static org.mockito.Mockito.*;
2121

22-
import java.text.DateFormat;
23-
import java.text.Format;
24-
import java.text.SimpleDateFormat;
2522
import java.util.Arrays;
2623
import java.util.Collections;
2724
import java.util.Date;
@@ -33,6 +30,7 @@
3330
import org.jmolecules.ddd.types.Identifier;
3431
import org.joda.time.DateTime;
3532
import org.junit.jupiter.api.Test;
33+
3634
import org.springframework.aop.framework.ProxyFactory;
3735
import org.springframework.core.convert.converter.Converter;
3836
import org.springframework.core.convert.converter.ConverterFactory;
@@ -48,6 +46,7 @@
4846
import org.springframework.data.convert.ThreeTenBackPortConverters.LocalDateTimeToJavaTimeInstantConverter;
4947
import org.springframework.data.geo.Point;
5048
import org.springframework.data.mapping.model.SimpleTypeHolder;
49+
5150
import org.threeten.bp.LocalDateTime;
5251

5352
/**
@@ -163,8 +162,8 @@ void shouldSelectPropertCustomWriteTargetForCglibProxiedType() {
163162
void shouldSelectPropertCustomReadTargetForCglibProxiedType() {
164163

165164
CustomConversions conversions = new CustomConversions(StoreConversions.NONE,
166-
Arrays.asList(CustomObjectToStringConverter.INSTANCE));
167-
assertThat(conversions.hasCustomReadTarget(createProxyTypeFor(Object.class), String.class)).isTrue();
165+
Arrays.asList(CustomTypeToStringConverter.INSTANCE));
166+
assertThat(conversions.hasCustomReadTarget(createProxyTypeFor(CustomType.class), String.class)).isTrue();
168167
}
169168

170169
@Test // DATAMONGO-1131, DATACMNS-1035
@@ -316,7 +315,7 @@ enum StringToFormatConverter implements Converter<String, Format> {
316315
INSTANCE;
317316

318317
public Format convert(String source) {
319-
return DateFormat.getInstance();
318+
return new DateFormat();
320319
}
321320
}
322321

@@ -367,12 +366,13 @@ public Date convert(DateTime source) {
367366
}
368367
}
369368

370-
enum CustomObjectToStringConverter implements Converter<Object, String> {
369+
@ReadingConverter
370+
enum CustomTypeToStringConverter implements Converter<CustomType, String> {
371371

372372
INSTANCE;
373373

374374
@Override
375-
public String convert(Object source) {
375+
public String convert(CustomType source) {
376376
return source != null ? source.toString() : null;
377377
}
378378

@@ -414,7 +414,7 @@ public T convert(String source) {
414414
}
415415

416416
try {
417-
return targetType.newInstance();
417+
return targetType.getDeclaredConstructor().newInstance();
418418
} catch (Exception e) {
419419
throw new IllegalArgumentException(e.getMessage(), e);
420420
}
@@ -423,4 +423,11 @@ public T convert(String source) {
423423
}
424424

425425
static class CustomType {}
426+
427+
static class Format {}
428+
429+
static class DateFormat extends Format {}
430+
431+
static class SimpleDateFormat extends DateFormat {}
432+
426433
}

‎src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,13 @@ void shouldNotCreatePersistentEntityForListButItsGenericTypeArgument() {
296296
}
297297

298298
@Test // GH-2390
299-
void detectsEntityTypeEveneIfSimpleTypeHolderConsidersCollectionsSimple() {
299+
void detectsEntityTypeEvenIfSimpleTypeHolderConsidersCollectionsSimple() {
300300

301301
context.setSimpleTypeHolder(new SimpleTypeHolder(Collections.emptySet(), true) {
302302

303303
@Override
304304
public boolean isSimpleType(Class<?> type) {
305-
return type.getName().startsWith("java.util.");
305+
return type == String.class || type.getName().startsWith("java.util.");
306306
}
307307
});
308308

‎src/test/java/org/springframework/data/mapping/model/PersistentPropertyAccessorTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.sql.Timestamp;
2525
import java.util.ArrayList;
2626
import java.util.List;
27-
import java.util.UUID;
2827
import java.util.function.Function;
2928

3029
import org.junit.jupiter.api.Test;
@@ -130,7 +129,7 @@ void shouldUseKotlinGeneratedCopyMethod(Function<Object, PersistentPropertyAcces
130129
void kotlinCopyMethodShouldNotSetUnsettableProperty(
131130
Function<Object, PersistentPropertyAccessor<?>> propertyAccessorFunction) {
132131

133-
SingleSettableProperty bean = new SingleSettableProperty(UUID.randomUUID());
132+
SingleSettableProperty bean = new SingleSettableProperty(1.1);
134133
PersistentPropertyAccessor accessor = propertyAccessorFunction.apply(bean);
135134
SamplePersistentProperty property = getProperty(bean, "version");
136135

@@ -224,4 +223,9 @@ private static class ValueClass {
224223
String immutable;
225224
}
226225

226+
static class UnsettableVersion {
227+
228+
private final int version = (int) Math.random();
229+
}
230+
227231
}

‎src/test/kotlin/org/springframework/data/mapping/model/DataClasses.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package org.springframework.data.mapping.model
1717

1818
import org.springframework.data.annotation.Id
1919
import java.time.LocalDateTime
20-
import java.util.*
2120

2221
/**
2322
* @author Mark Paluch
@@ -30,7 +29,7 @@ data class ExtendedDataClassKt(val id: Long, val name: String) {
3029
}
3130
}
3231

33-
data class SingleSettableProperty constructor(val id: UUID = UUID.randomUUID()) {
32+
data class SingleSettableProperty constructor(val id: Double = Math.random()) {
3433
val version: Int? = null
3534
}
3635

0 commit comments

Comments
 (0)