HTM-1711: Upgrade to Java 25

set up java version and update documentation and workflow files

Author: mprins

.devcontainer/Dockerfile

@@ -1,10 +1,10 @@
 # Copyright (C) 2024 B3Partners B.V.
 #
 # SPDX-License-Identifier: MIT
-FROM mcr.microsoft.com/devcontainers/java:21
+FROM mcr.microsoft.com/devcontainers/java:25
 
 ARG INSTALL_MAVEN="true"
-ARG MAVEN_VERSION="3.9.12"
+ARG MAVEN_VERSION="3.9.13"
 
 ARG INSTALL_GRADLE="false"
 ARG GRADLE_VERSION=""

.github/copilot-instructions.md

@@ -17,7 +17,7 @@ facilitates collaboration, makes coding simpler, and ensures that best practices
 
 # Development Environment
 
-Tailormap API is written in **Java 21** using **GeoTools 34.x**, **Hibernate 7.2.x** and **Spring Boot 4.0.x** and
+Tailormap API is written in **Java 25** using **GeoTools 34.x**, **Hibernate 7.2.x** and **Spring Boot 4.0.x** and
 leverages **OpenApi 3.0.4**.
 Dependencies for this project are managed using Maven in the file `pom.xml` in the root of the repository.
 Code for this project is generated using Maven using the file `pom.xml` in the root of the repository.
@@ -29,7 +29,7 @@ Administrative REST controllers in the `org.tailormap.api.controller` package us
 Swagger annotations such as `@Operation` and `@ApiResponse`.
 
 ## Code Standards
-- **Java Version**: Use Java 21 features and syntax.
+- **Java Version**: Use Java 25 features and syntax.
 - **GeoTools**: Use GeoTools 34.x for geospatial data handling.
 - **Hibernate**: Use Hibernate 7.2.x for ORM and database interactions.
 - **Spring Boot**: Use Spring Boot 4.0.x for building RESTful APIs.

.github/dependabot.yml

@@ -53,10 +53,10 @@ updates:
     labels:
       - infrastructure
     ignore:
-      # stay on Java 21 for now
+      # stay on Java 25 for now
       - dependency-name: "eclipse-temurin"
         versions:
-          - ">= 22"
+          - ">= 26"
 
   - package-ecosystem: "docker-compose"
     directory: "/build/ci/"

.github/workflows/codeql.yml

@@ -6,7 +6,7 @@ concurrency:
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true
-  MAVEN_VERSION: '3.9.12'
+  MAVEN_VERSION: '3.9.13'
 
 on:
   push:
@@ -51,7 +51,7 @@ jobs:
       - name: 'Set up JDK'
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
           cache: 'maven'
 

.github/workflows/copilot-setup-steps.yml

@@ -22,7 +22,7 @@ jobs:
       - name: 'Set up JDK'
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
           cache: 'maven'
 

.github/workflows/macos-maven.yml

@@ -5,7 +5,7 @@ permissions:
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true
-  MAVEN_VERSION: '3.9.12'
+  MAVEN_VERSION: '3.9.13'
 
 concurrency:
   group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    name: 'Build w/ Java 21'
+    name: 'Build'
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v6
@@ -31,7 +31,7 @@ jobs:
       - name: 'Set up JDK'
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
 
       - name: 'Set up Maven'

.github/workflows/owasp-dependency-check.yml

@@ -2,7 +2,7 @@ name: 'OWASP'
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true
-  MAVEN_VERSION: '3.9.12'
+  MAVEN_VERSION: '3.9.13'
 
 concurrency: # More info: https://stackoverflow.com/a/68422069/253468
   group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}
@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
           cache: 'maven'
 
       - name: 'Set up Maven'

.github/workflows/qa.yml

@@ -2,7 +2,7 @@ name: 'Ubuntu QA Maven build'
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true
-  MAVEN_VERSION: '3.9.12'
+  MAVEN_VERSION: '3.9.13'
 
 concurrency:
   group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}
@@ -34,7 +34,7 @@ jobs:
       - name: 'Set up JDK'
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
           cache: 'maven'
 

.github/workflows/trivy.yml

@@ -2,7 +2,7 @@ name: 'Trivy Security Scan'
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true
-  MAVEN_VERSION: '3.9.12'
+  MAVEN_VERSION: '3.9.13'
 
 on: # use pull request so this workflow dos not fail when triggered by dependabot PR's
   pull_request:
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
           cache: 'maven'
 
       - name: 'Set up Maven'

.github/workflows/ubuntu-maven.yml

@@ -6,8 +6,8 @@ permissions:
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true
-  MAVEN_VERSION: '3.9.12'
-  JAVA_VERSION: '21'
+  MAVEN_VERSION: '3.9.13'
+  JAVA_VERSION: '25'
 
 concurrency:
   group: ${{ github.workflow }}-${{ ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' ) && format('ci-main-{0}', github.sha) || format('ci-main-{0}', github.ref) }}
@@ -24,7 +24,7 @@ on:
 
 jobs:
   build:
-    name: Build w/ Java 21
+    name: Build
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -77,7 +77,6 @@ jobs:
     permissions:
       contents: read
       packages: read
-#      actions: write
     if: ${{ github.author != 'dependabot[bot]' }}
     needs: build
     steps: