Skip to content

Commit 83cfca0

Browse files
committed
Test against Java 20 in CI.
Resolves #2892.
1 parent 1a381e5 commit 83cfca0

File tree

3 files changed

+46
-23
lines changed

3 files changed

+46
-23
lines changed

Jenkinsfile

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline {
1818
}
1919

2020
stages {
21-
stage("test: baseline (Java 17)") {
21+
stage("test: baseline (main)") {
2222
when {
2323
beforeAgent(true)
2424
anyOf {
@@ -35,7 +35,7 @@ pipeline {
3535
}
3636
steps {
3737
script {
38-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
38+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) { // TODO: Switch back to `main`
3939
sh 'PROFILE=all-dbs ci/test.sh'
4040
sh "ci/clean.sh"
4141
}
@@ -70,6 +70,23 @@ pipeline {
7070
}
7171
}
7272
}
73+
stage("test: baseline (next)") {
74+
agent {
75+
label 'data'
76+
}
77+
options { timeout(time: 30, unit: 'MINUTES')}
78+
environment {
79+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
80+
}
81+
steps {
82+
script {
83+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
84+
sh 'PROFILE=all-dbs ci/test.sh'
85+
sh "ci/clean.sh"
86+
}
87+
}
88+
}
89+
}
7390
}
7491
}
7592

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
</excludes>
182182
<argLine>
183183
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
184-
-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
184+
<!-- -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}-->
185185
</argLine>
186186
</configuration>
187187
</execution>
@@ -196,7 +196,7 @@
196196
<include>**/EclipseLink*Tests.java</include>
197197
</includes>
198198
<argLine>
199-
-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
199+
<!-- -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}-->
200200
-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
201201
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
202202
</argLine>

spring-data-jpa/pom.xml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,14 @@
155155
<artifactId>hibernate-core</artifactId>
156156
<version>${hibernate}</version>
157157
<optional>true</optional>
158+
<exclusions>
159+
<exclusion>
160+
<groupId>net.bytebuddy</groupId>
161+
<artifactId>byte-buddy</artifactId>
162+
</exclusion>
163+
</exclusions>
158164
</dependency>
159-
165+
160166
<dependency>
161167
<groupId>${hibernate.groupId}.orm</groupId>
162168
<artifactId>hibernate-jpamodelgen</artifactId>
@@ -256,22 +262,22 @@
256262
Jacoco plugin redeclared to make sure it's downloaded and
257263
the agents can be explicitly added to the test executions.
258264
-->
259-
<plugin>
260-
<groupId>org.jacoco</groupId>
261-
<artifactId>jacoco-maven-plugin</artifactId>
262-
<version>${jacoco}</version>
263-
<configuration>
264-
<destFile>${jacoco.destfile}</destFile>
265-
</configuration>
266-
<executions>
267-
<execution>
268-
<id>jacoco-initialize</id>
269-
<goals>
270-
<goal>prepare-agent</goal>
271-
</goals>
272-
</execution>
273-
</executions>
274-
</plugin>
265+
<!-- <plugin>-->
266+
<!-- <groupId>org.jacoco</groupId>-->
267+
<!-- <artifactId>jacoco-maven-plugin</artifactId>-->
268+
<!-- <version>${jacoco}</version>-->
269+
<!-- <configuration>-->
270+
<!-- <destFile>${jacoco.destfile}</destFile>-->
271+
<!-- </configuration>-->
272+
<!-- <executions>-->
273+
<!-- <execution>-->
274+
<!-- <id>jacoco-initialize</id>-->
275+
<!-- <goals>-->
276+
<!-- <goal>prepare-agent</goal>-->
277+
<!-- </goals>-->
278+
<!-- </execution>-->
279+
<!-- </executions>-->
280+
<!-- </plugin>-->
275281

276282
<plugin>
277283
<groupId>org.apache.maven.plugins</groupId>
@@ -326,7 +332,7 @@
326332
</excludes>
327333
<argLine>
328334
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
329-
-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
335+
<!-- -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}-->
330336
</argLine>
331337
</configuration>
332338
</execution>
@@ -341,7 +347,7 @@
341347
<include>**/EclipseLink*Tests.java</include>
342348
</includes>
343349
<argLine>
344-
-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
350+
<!-- -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}-->
345351
-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
346352
-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
347353
</argLine>

0 commit comments

Comments
 (0)