Upgrade test sources to Java 25

.circleci/config.yml

@@ -16,7 +16,7 @@
 executors:
   java:
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
 
 # common commands
 commands:
@@ -25,7 +25,7 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Check if cache was restored'
           command: |
@@ -63,6 +63,7 @@ defaults: &defaults
   environment:
     # Customize the JVM maximum heap limit
     MAVEN_OPTS: -Xmx3200m
+    JAVA_HOME: /usr/lib/jvm/java-25-openjdk-amd64
 
 # branch filters
 master-only: &master-only
@@ -92,26 +93,27 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
     steps:
       - checkout
       - resolve-dependencies
       - save_cache:
           paths:
-            - ~/.m2
-          key: m2-{{ checksum "pom.xml" }}
+            - ~/.m2/repository
+          key: m2repo-{{ checksum "pom.xml" }}
   test:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
+          no_output_timeout: 60m
           command: |
             ./mvnw -ntp -B verify -Pno-databases
       - save-test-results
@@ -120,32 +122,48 @@ jobs:
     machine:
       image: windows-server-2019-vs2019:current # Windows machine image
     resource_class: windows.medium
+    environment:
+      MAVEN_OPTS: -Xmx3200m
 
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
+      - run:
+          name: 'Install JDK 25'
+          command: |
+            $ProgressPreference = 'SilentlyContinue'
+            Invoke-WebRequest -Uri "https://api.adoptium.net/v3/binary/latest/25/ga/windows/x64/jdk/hotspot/normal/eclipse?project=jdk" -OutFile "$env:TEMP\jdk.zip"
+            Expand-Archive -Path "$env:TEMP\jdk.zip" -DestinationPath "C:\jdk25"
+            $jdkDir = Get-ChildItem "C:\jdk25" -Directory | Select-Object -First 1
+            [Environment]::SetEnvironmentVariable("JAVA_HOME", $jdkDir.FullName, "Machine")
+            Write-Host "JAVA_HOME set to $($jdkDir.FullName)"
+            & "$($jdkDir.FullName)\bin\java" -version
+          shell: powershell.exe
       - run:
           name: 'Test'
           command: |
+            export JAVA_HOME="$(ls -d /c/jdk25/jdk-* | head -1)"
+            export PATH="$JAVA_HOME/bin:$PATH"
+            java -version
             ./mvnw -ntp -B verify -Pno-databases -Dtoolchain.skip=true
           shell: bash.exe
 
   buildExamples:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Prepare environment'
           command: |
-            ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc,:querydsl-sql-json -am -T2
+            ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc,:querydsl-sql-json -am
       - run:
           name: 'Build and test examples'
           command: |
@@ -169,16 +187,18 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
     steps:
       - checkout
       - run:
           name: 'Prepare environment'
           command: |
             ./mvnw -N org.codehaus.mojo:properties-maven-plugin:1.2.1:write-project-properties -Dproperties.outputFile=querydsl-examples/querydsl-example-ksp-codegen/gradle.properties
-            ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-ksp-codegen,:querydsl-jpa -am -T2
+            ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-ksp-codegen,:querydsl-jpa -am
       - run:
           name: 'Build and test examples'
+          environment:
+            JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
           command: |
             cd querydsl-examples/querydsl-example-ksp-codegen
             ./gradlew --no-daemon --console=plain --info --stacktrace test
@@ -194,7 +214,7 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
       - image: mysql:5.6.38
         environment:
           - MYSQL_ROOT_PASSWORD=querydsl
@@ -205,7 +225,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -215,7 +235,7 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
       - image: postgis/postgis:16-3.4-alpine
         environment:
           - POSTGRES_USER=querydsl
@@ -225,7 +245,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -235,15 +255,15 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
       - image: cubrid/cubrid:11.3
         environment:
           - CUBRID_DB=demodb
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -253,7 +273,7 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
       - image: gvenzl/oracle-xe:slim-faststart
         environment:
           - ORACLE_PASSWORD=querydsl
@@ -264,7 +284,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -274,13 +294,13 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
       - image: mongo:8.0.9
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -290,7 +310,7 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
       - image: jacobalberty/firebird:v4
         environment:
           - ISC_PASSWORD=masterkey
@@ -302,7 +322,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -312,12 +332,12 @@ jobs:
     <<: *defaults
     working_directory: ~/querydsl
     docker:
-      - image: velo/toolchains-4-ci-builds:latest
+      - image: velo/toolchains-4-ci-builds:with-25
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: 'Test'
           command: |
@@ -328,18 +348,15 @@ jobs:
     machine: true
     working_directory: ~/querydsl
     environment:
-      # You can also set any DB2-specific environment variables here if needed
       DB2INST1_PASSWORD: a3sd!fDj
     steps:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
-      # Start the DB2 container in detached mode
+            - m2repo-{{ checksum "pom.xml" }}
       - run:
           name: "Start DB2 container"
           command: |
-            # Start the DB2 container with the same settings as your docker-compose file
             docker run -d --privileged --name db2 \
               -p 50000:50000 \
               -e DB2INST1_PASSWORD=a3sd!fDj \
@@ -351,7 +368,6 @@ jobs:
               ibmcom/db2:11.5.0.0
 
             echo "Waiting for DB2 to initialize..."
-            # Basic health-check loop; replace with a more robust check if available
             for i in {1..60}; do
               if docker logs db2 2>&1 | grep -q "All databases are now active"; then
                 echo "DB2 appears to be up"
@@ -361,17 +377,23 @@ jobs:
               sleep 10
             done
             docker ps
-
-      # Run your tests against DB2; adjust the Maven command according to your project
       - run:
           name: "Run DB2 tests"
           command: |
-            ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.DB2 -Dtoolchain.skip=true
-      # Clean up the DB2 container once the tests are done
+            docker run --rm \
+              --network host \
+              -v $(pwd):/code \
+              -v ~/.m2/repository:/root/.m2/repository \
+              -w /code \
+              -e MAVEN_OPTS=-Xmx3200m \
+              -e JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64 \
+              velo/toolchains-4-ci-builds:with-25 \
+              ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.DB2
       - run:
           name: "Stop and remove DB2 container"
           command: |
             docker stop db2 && docker rm db2
+          when: always
       - save-test-results
 
   deploySnapshot:
@@ -382,7 +404,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - configure-gpg
       - run:
           name: 'Deploy Core Modules Sonatype'
@@ -397,7 +419,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - m2-{{ checksum "pom.xml" }}
+            - m2repo-{{ checksum "pom.xml" }}
       - configure-gpg
       - run:
           name: 'Deploy Core Modules Sonatype'

.github/workflows/codeql-analysis.yml

@@ -93,7 +93,7 @@ jobs:
       uses: actions/setup-java@v4.0.0
       with:
         distribution: 'temurin'
-        java-version: '21'
+        java-version: '25'
 
     - name: Compile project
       run: ./mvnw -B -ntp clean package -DskipTests=true -Dtoolchain.skip=true -pl '!:querydsl-kotlin-codegen,!:querydsl-ksp-codegen,!:querydsl-kotlin'

pom.xml

@@ -89,7 +89,7 @@
 
     <!-- default bytecode version for src/main -->
     <main.java.version>17</main.java.version>
-    <latest.java.version>21</latest.java.version>
+    <latest.java.version>25</latest.java.version>
 
     <git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
 
@@ -974,6 +974,7 @@
 
       <properties>
         <excludedGroups>com.querydsl.core.testutil.Database,
+                        com.querydsl.core.testutil.MongoDB,
                         com.querydsl.core.testutil.SlowTest,
                         com.querydsl.core.testutil.Performance,
                         com.querydsl.core.testutil.ReportingOnly</excludedGroups>
@@ -993,6 +994,7 @@
       <properties>
         <!-- default groups to exclude from surefire plugin -->
         <excludedGroups>com.querydsl.core.testutil.ExternalDatabase,
+                        com.querydsl.core.testutil.MongoDB,
                         com.querydsl.core.testutil.SlowTest,
                         com.querydsl.core.testutil.Performance,
                         com.querydsl.core.testutil.ReportingOnly</excludedGroups>
@@ -1053,7 +1055,7 @@
                     <recipe>org.openrewrite.java.testing.junit5.AssertToAssertions</recipe>
                     <recipe>org.openrewrite.java.testing.assertj.JUnitToAssertj</recipe>
                     <recipe>org.openrewrite.java.testing.assertj.Assertj</recipe>
-                    <recipe>org.openrewrite.java.migrate.UpgradeToJava21</recipe>
+                    <recipe>org.openrewrite.java.migrate.UpgradeToJava25</recipe>
                   </activeRecipes>
                   <exclusions>
                     <exclusion>**/src/main/java/**</exclusion>

querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile

@@ -1,7 +1,7 @@
-FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21 AS build
+FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-25 AS build
 COPY --chown=quarkus:quarkus . /code/
 USER quarkus
 WORKDIR /code
 
-RUN ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-jpa -am -T2 -Dtoolchain.skip -Dgcf.skip
+RUN ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-jpa -am -Dtoolchain.skip -Dgcf.skip
 RUN ./mvnw verify -Dnative -Pexamples -pl :querydsl-example-jpa-quarkus -Dtoolchain.skip -Dgcf.skip

querydsl-libraries/querydsl-core/pom.xml

@@ -43,10 +43,16 @@
       <version>2.9.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>