Skip to content

Commit fb4dd39

Browse files
ssthomssthom
authored
feat: upgrade jenkinsfile-runner to Java 17 and Jenkins version 2.462.3 (#723)
* feat: upgrade jenkinsfile-runner to Java 17 and Jenkins version 2.462.3 * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build * fix: github actions and Jenkinsfile build
1 parent 59dec97 commit fb4dd39

File tree

20 files changed

+112
-84
lines changed

20 files changed

+112
-84
lines changed

‎.github/workflows/docker-cd.yml‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ jobs:
1313
build-maven:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up JDK 11
18-
uses: actions/setup-java@v3
16+
- name: Check out
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
- name: Set up JDK 17
21+
uses: actions/setup-java@v4
1922
with:
20-
java-version: '11'
21-
distribution: 'temurin'
23+
java-version: 17
24+
distribution: temurin
2225
- name: Build with Maven
2326
working-directory: .
24-
run: mvn -B package
27+
run: mvn -B package -Dset.changelist -DargLine="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
2528

2629
build-docker:
2730
runs-on: ubuntu-latest
@@ -32,17 +35,22 @@ jobs:
3235
fail-fast: false
3336
matrix:
3437
include:
35-
- alias: jre-11
36-
dockerfile: packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile
38+
- alias: jre-17
39+
dockerfile: packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile
3740
tags: test
38-
- alias: jre-11-alpine
39-
dockerfile: packaging/docker/unix/eclipse-temurin-11-jre-alpine/Dockerfile
41+
- alias: jre-17-alpine
42+
dockerfile: packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile
4043
tags: test-alpine
4144
name: "Build Docker image: ${{ matrix.alias }}"
4245

4346
steps:
44-
- uses: actions/checkout@v2
45-
47+
- name: Install dependencies
48+
run: |
49+
sudo apt-get update
50+
sudo apt-get install -y git
51+
- uses: actions/checkout@v4
52+
with:
53+
fetch-depth: 0
4654
- name: Set up Docker Buildx
4755
uses: docker/setup-buildx-action@v1.5.0
4856

@@ -67,16 +75,16 @@ jobs:
6775
fail-fast: false
6876
matrix:
6977
include:
70-
- alias: jre-11
71-
dockerfile: packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile
72-
tag-prefix: eclipse-temurin-11-jre-
78+
- alias: jre-17
79+
dockerfile: packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile
80+
tag-prefix: eclipse-temurin-17-jre-
7381
tag-latest: true
74-
extra-tags: ", ghcr.io/${{ github.repository }}:jre-11"
75-
- alias: jre-11-alpine
76-
dockerfile: packaging/docker/unix/eclipse-temurin-11-jre-alpine/Dockerfile
77-
tag-prefix: eclipse-temurin-11-jre-alpine-
82+
extra-tags: ", ghcr.io/${{ github.repository }}:jre-17"
83+
- alias: jre-17-alpine
84+
dockerfile: packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile
85+
tag-prefix: eclipse-temurin-17-jre-alpine-
7886
tag-latest: false
79-
extra-tags: ", ghcr.io/${{ github.repository }}:alpine, ghcr.io/${{ github.repository }}:jre-11-alpine"
87+
extra-tags: ", ghcr.io/${{ github.repository }}:alpine, ghcr.io/${{ github.repository }}:jre-17-alpine"
8088
needs:
8189
- build-maven
8290
- build-docker

‎.github/workflows/publish-release-artifact.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v2
18-
- name: Set up JDK 11
18+
- name: Set up JDK 17
1919
uses: actions/setup-java@v3
2020
with:
21-
java-version: 11
21+
java-version: 17
2222
distribution: 'temurin'
2323
- name: Set version
2424
id: set-version
@@ -55,14 +55,14 @@ jobs:
5555
fail-fast: false
5656
matrix:
5757
include:
58-
- alias: jre-11
59-
dockerfile: packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile
60-
tag-prefix: eclipse-temurin-11-jre-
61-
extra-tags--pattern: ", ghcr.io/${{ github.repository }}:jre-11-$RELEASE_VERSION"
62-
- alias: jre-11-alpine
63-
dockerfile: packaging/docker/unix/eclipse-temurin-11-jre-alpine/Dockerfile
64-
tag-prefix: eclipse-temurin-11-jre-alpine-
65-
extra-tags-pattern: ", ghcr.io/${{ github.repository }}:alpine-$RELEASE_VERSION, ghcr.io/${{ github.repository }}:jre-11-alpine-$RELEASE_VERSION"
58+
- alias: jre-17
59+
dockerfile: packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile
60+
tag-prefix: eclipse-temurin-17-jre-
61+
extra-tags--pattern: ", ghcr.io/${{ github.repository }}:jre-17-$RELEASE_VERSION"
62+
- alias: jre-17-alpine
63+
dockerfile: packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile
64+
tag-prefix: eclipse-temurin-17-jre-alpine-
65+
extra-tags-pattern: ", ghcr.io/${{ github.repository }}:alpine-$RELEASE_VERSION, ghcr.io/${{ github.repository }}:jre-17-alpine-$RELEASE_VERSION"
6666
permissions:
6767
contents: read
6868
packages: write

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.2</version>
5+
<version>1.8</version>
66
</extension>
77
</extensions>

‎CONTRIBUTING.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ This will generate an assembly artifact through the `appassembler-maven-plugin`
4747

4848
This repository includes the base image which can be built simply as...
4949

50-
docker build -t jenkins4eval/jenkinsfile-runner -f packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile .
50+
docker build -t jenkins4eval/jenkinsfile-runner -f packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile .
5151

5252
During development you can reuse the local machine build instead of doing a full build from scratch
5353

54-
docker build -t jenkins4eval/jenkinsfile-runner:dev -f packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile-dev-vanilla .
54+
docker build -t jenkins4eval/jenkinsfile-runner:dev -f packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile-dev-vanilla .
5555

5656
== Debugging
5757

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Map branches = [:]
1616
for (int i = 0; i < platforms.size(); ++i) {
1717
String label = platforms[i]
1818
branches[label] = {
19-
node(label + " && docker") {
19+
node("maven-17") {
2020
timestamps {
2121
ws("platform_${label}_${branchName}_${buildNumber}") {
2222
stage('Checkout') {
@@ -25,7 +25,7 @@ for (int i = 0; i < platforms.size(); ++i) {
2525

2626
stage('Build') {
2727
timeout(60) {
28-
infra.runMaven(['clean', 'install', '-Dset.changelist', '-Dmaven.test.failure.ignore=true', '-Denvironment=test', '-Ppackage-app,package-vanilla,jacoco,run-its'], '11')
28+
infra.runMaven(['clean', 'install', '-Dset.changelist', '-Dmaven.test.failure.ignore=true', '-Denvironment=test', '-Ppackage-app,package-vanilla,jacoco,run-its', '--add-opens=java.base/java.util=ALL-UNNAMED', '--add-opens=java.base/java.lang=ALL-UNNAMED', '--add-opens=java.base/java.lang.invoke=ALL-UNNAMED'], '17')
2929
}
3030
}
3131

‎app/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<goal>assemble</goal>
2424
</goals>
2525
<configuration>
26+
<extraJvmArguments>--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED</extraJvmArguments>
2627
<programs>
2728
<program>
2829
<id>jenkinsfile-runner</id>

‎packaging-parent-pom/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<plugin>
177177
<groupId>org.apache.maven.plugins</groupId>
178178
<artifactId>maven-assembly-plugin</artifactId>
179-
<version>3.3.0</version>
179+
<version>3.7.1</version>
180180
<configuration>
181181
<skipAssembly>${jfr.packaging.skip.assembly}</skipAssembly>
182182
<!-- Disabled due to https://github.com/jenkinsci/jenkinsfile-runner/issues/350
@@ -230,7 +230,7 @@
230230
</goals>
231231
<configuration>
232232
<!--TODO: Add option to skip this step -->
233-
<minimumJavaVersion>8</minimumJavaVersion>
233+
<minimumJavaVersion>11</minimumJavaVersion>
234234
<jenkinsCoreVersionOverride>${jenkins.version}</jenkinsCoreVersionOverride>
235235
<outputDirectory>${project.build.directory}/plugins</outputDirectory>
236236
</configuration>

‎packaging-slim-parent-pom/README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The parent POM prepares the following artifacts in `target`:
1717
1818
== Usage in Docker
1919

20-
See link:../packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile-dev-slim[Dockerfile-dev-slim] for example.
20+
See link:../packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile-dev-slim[Dockerfile-dev-slim] for example.
2121
This example also uses additional optimization tricks.
2222

2323
== Status

‎packaging-slim-parent-pom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</goals>
6565
<configuration>
6666
<!--TODO: Add option to skip this step -->
67-
<minimumJavaVersion>8</minimumJavaVersion>
67+
<minimumJavaVersion>11</minimumJavaVersion>
6868
<jenkinsCoreVersionOverride>${jenkins.version}</jenkinsCoreVersionOverride>
6969
<outputDirectory>${project.build.directory}/plugins</outputDirectory>
7070
</configuration>

‎packaging/docker/README.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ The following format is used:
2323
${JVM_VENDOR}-${JAVA_VERSION}[-${JVM_CLASSIFIER1}][-${JVM_CLASSIFIER2}]...[-${OS}]
2424
----
2525

26-
Examples: `eclipse-temurin-11-jre`, `eclipse-temurin-11-jre-alpine`
26+
Examples: `eclipse-temurin-17-jre`, `eclipse-temurin-17-jre-alpine`
2727

2828
* `JVM_VENDOR` - source of the JVM in lowercase, e.g. Eclipse Temurin.
2929
* `JAVA_VERSION` - version of the JVM.
30-
Right now `11` are used, fine-grain versions might be added in the future.
30+
Right now `17` are used, fine-grain versions might be added in the future.
3131
* `JVM_CLASSIFIER` - Additional information about the JVM used in the image.
3232
It might refer to `jdk`/`jre` or a JVM type (e.g. `jre-alpine`, `openj9`).
3333
Multiple classifiers might be used.

0 commit comments

Comments
 (0)