Merge branch 'main' into dependabot-maven-geowebcache-main-maven-dd4e7b3d4a

Author: aaime

.github/workflows/azure-integration.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         java-version: [ 17, 21 ]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
@@ -53,7 +53,7 @@ jobs:
     #  !contains(needs.*.result, 'cancelled') &&
     #  !contains(needs.*.result, 'failure')
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'

.github/workflows/backport.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Backport Bot
         id: backport
         if: github.event.pull_request.merged && ( ( github.event.action == 'closed' && contains( join( github.event.pull_request.labels.*.name ), 'backport') ) || contains( github.event.label.name, 'backport' ) )
-        uses: m-kuhn/backport@v1.2.7
+        uses: m-kuhn/backport@v1.2.8
         with:
           github_token: ${{ secrets.GH_TOKEN_BOT }}
 

.github/workflows/diskquota-jdbc-integration.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         java-version: [ 17, 21 ]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'

.github/workflows/gcs-integration.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         java-version: [ 17, 21 ]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'

.github/workflows/integration.yml

@@ -21,9 +21,9 @@ jobs:
       with:
         java-version: 17
         distribution: 'temurin'
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gwc-integration-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/linux.yml

@@ -13,14 +13,14 @@ jobs:
   openjdk17:
     runs-on: [ubuntu-22.04]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -35,14 +35,14 @@ jobs:
   openjdk21:
     runs-on: [ubuntu-22.04]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK 21
       uses: actions/setup-java@v5
       with:
         java-version: 21
         distribution: 'temurin'
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -57,14 +57,14 @@ jobs:
   openjdk25:
     runs-on: [ubuntu-22.04]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK 25
       uses: actions/setup-java@v5
       with:
         java-version: 25
         distribution: 'temurin'
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -80,14 +80,14 @@ jobs:
   QA:
     runs-on: [ubuntu-22.04]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/macos.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: [macos-latest]
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/windows.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: [windows-latest]
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
     - name: Maven repository caching
-      uses: actions/cache@v5
+      uses: actions/cache@v6
       with:
         path: ~/.m2/repository
         key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

documentation/en/user/source/conf.py

@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0-SNAPSHOT'
+release = '2.0.x'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

geowebcache/arcgiscache/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.geowebcache</groupId>
     <artifactId>geowebcache</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
     <!-- GWC VERSION -->
   </parent>
   <groupId>org.geowebcache</groupId>