Merge remote-tracking branch 'origin/master' into replace-static-sampling-with-configured-rate

Author: CTMBNara

.devcontainer/Dockerfile

@@ -1,3 +1,3 @@
 # From https://github.com/microsoft/vscode-dev-containers/blob/master/containers/go/.devcontainer/Dockerfile
-ARG VARIANT="21-jdk-bookworm"
+ARG VARIANT="25-jdk-trixie"
 FROM mcr.microsoft.com/vscode/devcontainers/java:${VARIANT}

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Update the VARIANT arg to pick a version of Java
-			"VARIANT": "21-jdk-bookworm",
+			"VARIANT": "25-jdk-trixie",
 		}
 	},
 	"containerEnv": {

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
 
       - name: Cache Maven packages
         uses: actions/cache@v5
@@ -52,7 +52,7 @@ jobs:
 
       - name: Build with Maven
         if: matrix.build-mode == 'manual'
-        run: mvn -B package --file extra/pom.xml
+        run: mvn -B clean package -DskipUnitTests --file extra/pom.xml
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v4

.github/workflows/docker-image-publish.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 25 ]
         dockerfile-path: [ Dockerfile, Dockerfile-modules ]
         include:
           - dockerfile-path: Dockerfile

.github/workflows/pr-functional-tests.yml

@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 25 ]
 
     steps:
       - uses: actions/checkout@v5

.github/workflows/pr-java-ci.yml

@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 25 ]
 
     steps:
       - uses: actions/checkout@v5

.github/workflows/pr-module-functional-tests.yml

@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 25 ]
 
     steps:
       - uses: actions/checkout@v5

.github/workflows/release-asset-publish.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [ 25 ]
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK

Dockerfile

@@ -1,4 +1,4 @@
-FROM amazoncorretto:21.0.8-al2023
+FROM amazoncorretto:25.0.3-al2023-headless
 
 WORKDIR /app/prebid-server
 

Dockerfile-modules

@@ -1,4 +1,4 @@
-FROM amazoncorretto:21.0.8-al2023
+FROM amazoncorretto:25.0.3-al2023-headless
 
 WORKDIR /app/prebid-server