Skip to content

Commit 98723c4

Browse files
committed
Upgrade to Java 17.
Closes #1537
1 parent 7d45591 commit 98723c4

File tree

2 files changed

+12
-114
lines changed

2 files changed

+12
-114
lines changed

Jenkinsfile

+3-51
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 'main'
@@ -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 -B'
3434
}
3535
}
3636
}
3737
}
3838
}
3939

40-
stage("Test other configurations") {
41-
when {
42-
allOf {
43-
branch 'main'
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 -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 -B'
80-
}
81-
}
82-
}
83-
}
84-
}
85-
}
86-
}
87-
8840
stage('Build project and 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} " +

parent/pom.xml

+9-63
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@
9292

9393
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9494
<project.root>${basedir}</project.root>
95-
<source.level>1.8</source.level>
95+
<source.level>17</source.level>
9696
<dist.id>${project.artifactId}</dist.id>
9797
<jacoco.destfile>${project.build.directory}/jacoco.exec</jacoco.destfile>
98+
<kotlin.jvm.target>11</kotlin.jvm.target>
9899
<maven.kotlin.skip>false</maven.kotlin.skip>
99100

100101
<apt>1.1.3</apt>
@@ -105,6 +106,7 @@
105106
<guava>19.0</guava>
106107
<hamcrest>1.3</hamcrest>
107108
<jackson>2.13.0-rc2</jackson>
109+
<jaxb>2.3.1</jaxb>
108110
<jacoco>0.8.7</jacoco>
109111
<jodatime>2.10.10</jodatime>
110112
<jmolecules>1.3.0</jmolecules>
@@ -129,10 +131,14 @@
129131
<spring>5.3.10</spring>
130132
<spring-hateoas>1.4.0-M3</spring-hateoas>
131133
<spring-plugin>2.0.0.RELEASE</spring-plugin>
134+
<servlet-api>4.0.1</servlet-api>
132135
<testcontainers>1.16.0</testcontainers>
133136
<threetenbp>1.5.1</threetenbp>
134137
<validation>1.1.0.Final</validation>
135138
<webbeans>2.0.23</webbeans>
139+
140+
<!-- OWB requires via XBean a newer ASM version -->
141+
<webbeans.xbean>4.20</webbeans.xbean>
136142
<javax-annotation-api>1.3.2</javax-annotation-api>
137143

138144
<!-- Used in asciidoc reference documentation -->
@@ -207,43 +213,11 @@
207213

208214
</profile>
209215

210-
<!-- Used to build Java 11+ -->
211-
<profile>
212-
<id>java11</id>
213-
214-
<properties>
215-
<jaxb.version>2.2.11</jaxb.version>
216-
<java-activation.version>1.1.1</java-activation.version>
217-
</properties>
218-
219-
<dependencies>
220-
<dependency>
221-
<groupId>javax.xml.bind</groupId>
222-
<artifactId>jaxb-api</artifactId>
223-
<version>${jaxb.version}</version>
224-
<scope>provided</scope>
225-
</dependency>
226-
227-
<dependency>
228-
<groupId>javax.activation</groupId>
229-
<artifactId>activation</artifactId>
230-
<version>${java-activation.version}</version>
231-
<scope>provided</scope>
232-
</dependency>
233-
234-
<dependency>
235-
<groupId>javax.annotation</groupId>
236-
<artifactId>javax.annotation-api</artifactId>
237-
<version>${javax-annotation-api}</version>
238-
<scope>provided</scope>
239-
</dependency>
240-
</dependencies>
241-
</profile>
242216

243217
<!--
244218
Profile to be run before a release is executed, currently does the following:
245219

246-
- Prevents thrid-party snapshot dependencies in projects
220+
- Prevents third-party snapshot dependencies in projects
247221
-->
248222

249223
<profile>
@@ -277,34 +251,6 @@
277251
</build>
278252
</profile>
279253

280-
<profile>
281-
282-
<!-- Profile for SonarCube -->
283-
284-
<id>sonarcube</id>
285-
286-
<build>
287-
<plugins>
288-
<plugin>
289-
<groupId>org.jacoco</groupId>
290-
<artifactId>jacoco-maven-plugin</artifactId>
291-
<version>${jacoco}</version>
292-
<configuration>
293-
<destFile>${jacoco.destfile}</destFile>
294-
</configuration>
295-
<executions>
296-
<execution>
297-
<id>jacoco-initialize</id>
298-
<goals>
299-
<goal>prepare-agent</goal>
300-
</goals>
301-
</execution>
302-
</executions>
303-
</plugin>
304-
</plugins>
305-
</build>
306-
</profile>
307-
308254
<profile>
309255

310256
<!--
@@ -1110,7 +1056,7 @@
11101056
<artifactId>kotlin-maven-plugin</artifactId>
11111057
<version>${kotlin}</version>
11121058
<configuration>
1113-
<jvmTarget>${source.level}</jvmTarget>
1059+
<jvmTarget>${kotlin.jvm.target}</jvmTarget>
11141060
<apiVersion>1.3</apiVersion>
11151061
<languageVersion>1.3</languageVersion>
11161062
<skip>${maven.kotlin.skip}</skip>

0 commit comments

Comments
 (0)