Merge branch 'jdk25' into 'main'

rjeberhard · rjeberhard · commit d6d048cad3c4 · 2025-10-22T21:58:48.000Z
Use JDK 25

See merge request weblogic-cloud/weblogic-kubernetes-operator!5039
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,10 +23,10 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up JDK
-        uses: actions/setup-java@v5
+        uses: oracle-actions/setup-java@v1
         with:
-          distribution: 'oracle'
-          java-version: 21
+          website: oracle.com
+          release: 25
 
       - name: Cache Maven packages
         uses: actions/cache@v4
diff --git a/Dockerfile b/Dockerfile
@@ -4,8 +4,8 @@
 # -------------------------
 FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
 
-ENV JAVA_URL_X64="https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz"
-ENV JAVA_URL_AARCH64="https://download.oracle.com/java/21/latest/jdk-21_linux-aarch64_bin.tar.gz"
+ENV JAVA_URL_X64="https://download.oracle.com/java/25/latest/jdk-25_linux-x64_bin.tar.gz"
+ENV JAVA_URL_AARCH64="https://download.oracle.com/java/25/latest/jdk-25_linux-aarch64_bin.tar.gz"
 
 RUN set -eux; \
     microdnf -y install gzip tar; \
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -23,7 +23,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.armoke b/Jenkinsfile.armoke
@@ -23,7 +23,7 @@ pipeline {
     }
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21-arm'
+        jdk 'jdk25-arm'
     }
 
     environment {
diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly
@@ -39,7 +39,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.ocne b/Jenkinsfile.ocne
@@ -20,7 +20,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.ocne19 b/Jenkinsfile.ocne19
@@ -20,7 +20,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.okd b/Jenkinsfile.okd
@@ -21,7 +21,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.oke b/Jenkinsfile.oke
@@ -19,7 +19,7 @@ pipeline {
     }
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.okeext b/Jenkinsfile.okeext
@@ -11,7 +11,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.openshift b/Jenkinsfile.openshift
@@ -22,7 +22,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.podman b/Jenkinsfile.podman
@@ -31,7 +31,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/Jenkinsfile.podman.upgrade b/Jenkinsfile.podman.upgrade
@@ -36,7 +36,7 @@ pipeline {
 
     tools {
         maven 'maven-3.8.7'
-        jdk 'jdk21'
+        jdk 'jdk25'
     }
 
     environment {
diff --git a/common/pom.xml b/common/pom.xml
@@ -83,4 +83,10 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
+    </properties>
 </project>
diff --git a/json-schema-generator/pom.xml b/json-schema-generator/pom.xml
@@ -47,4 +47,10 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
+    </properties>
 </project>
diff --git a/operator-build-maven-plugin/pom.xml b/operator-build-maven-plugin/pom.xml
@@ -50,6 +50,12 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,6 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven-compiler-plugin-version}</version>
           <configuration>
-            <release>21</release>
             <compilerArgs>
               <arg>-Xpkginfo:always</arg>
               <arg>-Xlint:all</arg>
@@ -695,9 +694,10 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <src-integration-test>${project.basedir}/src/test/java</src-integration-test>
     <resource-integration-test>${project.basedir}/src/test/resources</resource-integration-test>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <java.version.range>21</java.version.range>
+    <maven.compiler.source>25</maven.compiler.source>
+    <maven.compiler.target>25</maven.compiler.target>
+    <maven.compiler.release>25</maven.compiler.release>
+    <java.version.range>25</java.version.range>
     <maven.version.range>[3.8.1,)</maven.version.range>
     <maven-enforcer-plugin-version>3.6.2</maven-enforcer-plugin-version>
     <maven-clean-plugin-version>3.5.0</maven-clean-plugin-version>
diff --git a/swagger-generator/pom.xml b/swagger-generator/pom.xml
@@ -52,4 +52,10 @@
             <artifactId>client-java</artifactId>
        </dependency>
     </dependencies>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
+    </properties>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ pipeline {`
`23`	`23`
`24`	`24`	`tools {`
`25`	`25`	`maven 'maven-3.8.7'`
`26`		`- jdk 'jdk21'`
	`26`	`+ jdk 'jdk25'`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`environment {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ pipeline {`
`39`	`39`
`40`	`40`	`tools {`
`41`	`41`	`maven 'maven-3.8.7'`
`42`		`- jdk 'jdk21'`
	`42`	`+ jdk 'jdk25'`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`environment {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ pipeline {`
`20`	`20`
`21`	`21`	`tools {`
`22`	`22`	`maven 'maven-3.8.7'`
`23`		`- jdk 'jdk21'`
	`23`	`+ jdk 'jdk25'`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`environment {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ pipeline {`
`21`	`21`
`22`	`22`	`tools {`
`23`	`23`	`maven 'maven-3.8.7'`
`24`		`- jdk 'jdk21'`
	`24`	`+ jdk 'jdk25'`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`environment {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ pipeline {`
`19`	`19`	`}`
`20`	`20`	`tools {`
`21`	`21`	`maven 'maven-3.8.7'`
`22`		`- jdk 'jdk21'`
	`22`	`+ jdk 'jdk25'`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`environment {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ pipeline {`
`11`	`11`
`12`	`12`	`tools {`
`13`	`13`	`maven 'maven-3.8.7'`
`14`		`- jdk 'jdk21'`
	`14`	`+ jdk 'jdk25'`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`environment {`