Skip to content

Commit 3cbc5fc

Browse files
committed
Merge branch 'jdk25' into 'main'
Move to JDK 25 See merge request weblogic-cloud/weblogic-monitoring-exporter!303
2 parents ffd5e2e + 5e354e5 commit 3cbc5fc

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2424
- name: Set up JDK
25-
uses: actions/setup-java@v5
25+
uses: oracle-actions/setup-java@v1
2626
with:
27-
distribution: 'oracle'
28-
java-version: 21
27+
website: oracle.com
28+
release: 25
2929
- name: Cache Maven packages
3030
uses: actions/cache@v4
3131
with:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
55

6-
ENV JAVA_URL_X64="https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz"
7-
ENV JAVA_URL_AARCH64="https://download.oracle.com/java/21/latest/jdk-21_linux-aarch64_bin.tar.gz"
6+
ENV JAVA_URL_X64="https://download.oracle.com/java/25/latest/jdk-25_linux-x64_bin.tar.gz"
7+
ENV JAVA_URL_AARCH64="https://download.oracle.com/java/25/latest/jdk-25_linux-aarch64_bin.tar.gz"
88

99
RUN set -eux; \
1010
microdnf -y install gzip tar; \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pipeline {
66

77
tools {
88
maven 'maven-3.8.7'
9-
jdk 'jdk21'
9+
jdk 'jdk25'
1010
}
1111

1212
stages {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
<skip.dependency-check>false</skip.dependency-check>
6666

67-
<java.version.range>21</java.version.range>
67+
<java.version.range>25</java.version.range>
6868
<maven.version.range>[3.8.1,)</maven.version.range>
6969
</properties>
7070

@@ -389,7 +389,7 @@
389389
<profile>
390390
<id>helidon-sidecar</id>
391391
<activation>
392-
<jdk>[21,)</jdk>
392+
<jdk>[25,)</jdk>
393393
</activation>
394394
<modules>
395395
<module>build-helper-mojo</module>

wls-exporter-sidecar/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
<artifactId>maven-compiler-plugin</artifactId>
134134
<version>${maven-compiler-plugin-version}</version>
135135
<configuration>
136-
<source>21</source>
137-
<target>21</target>
136+
<source>25</source>
137+
<target>25</target>
138138
<compilerArgs>
139139
<arg>-Xpkginfo:always</arg>
140140
<arg>-Xlint:all</arg>

0 commit comments

Comments
 (0)