Skip to content

Commit 4857964

Browse files
authored
Merge pull request #107 from IABTechLab/ian-UID2-3823-upgrade-java-21
upgrade java 21
2 parents a5f3d9e + 41bd1f1 commit 4857964

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

.github/workflows/build-and-test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ on: [pull_request, push, workflow_dispatch]
44
jobs:
55
build:
66
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-build-and-test.yaml@v2
7+
with:
8+
java_version: 21
79
secrets: inherit

.github/workflows/release-docker-image.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
with:
5050
release_type: ${{ inputs.release_type }}
5151
vulnerability_severity: ${{ inputs.vulnerability_severity }}
52+
java_version: 21
5253
secrets: inherit
5354

5455
e2e-test:

.github/workflows/validate-image.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ jobs:
2323
with:
2424
failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH'}}
2525
fail_on_error: ${{ inputs.fail_on_error || true }}
26+
java_version: 21
2627
secrets: inherit

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/11.0.22_7-jre-alpine/images/sha256-d7a82981336958683f147f17396fe2219cb1072a5853e8a8ef16d07f0535343a?context=explore
2-
FROM eclipse-temurin@sha256:564eb67091b2cda82952299b4be52bf1b039289234b52f46057fe1286c173b71
1+
# sha from https://hub.docker.com/layers/amd64/eclipse-temurin/21.0.3_9-jre-alpine/images/sha256-3c40389d278c7129d9032c5f3ce68fb150c2869b5e107ea801b150a2ae653253?context=explore
2+
FROM eclipse-temurin@sha256:3c40389d278c7129d9032c5f3ce68fb150c2869b5e107ea801b150a2ae653253
33

44
WORKDIR /app
55
EXPOSE 8088

pom.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,23 @@
105105
<artifactId>loki-logback-appender</artifactId>
106106
<version>1.2.0</version>
107107
</dependency>
108+
<dependency>
109+
<groupId>org.jacoco</groupId>
110+
<artifactId>jacoco-maven-plugin</artifactId>
111+
<version>0.8.12</version>
112+
</dependency>
108113
</dependencies>
109114

110115
<build>
111116
<plugins>
112117
<plugin>
113118
<groupId>org.apache.maven.plugins</groupId>
114119
<artifactId>maven-compiler-plugin</artifactId>
115-
<version>3.11.0</version>
120+
<version>3.12.1</version>
116121
<configuration>
117-
<source>11</source>
118-
<target>11</target>
122+
<source>21</source>
123+
<target>21</target>
124+
<release>21</release>
119125
</configuration>
120126
</plugin>
121127
<plugin>
@@ -176,7 +182,7 @@
176182
<plugin>
177183
<groupId>org.jacoco</groupId>
178184
<artifactId>jacoco-maven-plugin</artifactId>
179-
<version>0.8.8</version>
185+
<version>0.8.12</version>
180186
<executions>
181187
<execution>
182188
<goals>

0 commit comments

Comments
 (0)