Merge remote-tracking branch 'origin/4.2.x' into 4.3.x

Signed-off-by: Olga Maciaszek-Sharma <[email protected]>

# Conflicts:
#	.github/dependabot.yml
#	.github/workflows/maven.yml

Author: OlgaMaciaszek

.github/dependabot.yml

@@ -2,12 +2,12 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "4.1.x" # oldest OSS supported branch
+    target-branch: "4.2.x"
     schedule:
       interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "4.2.x"
+    target-branch: "4.3.x"
     schedule:
       interval: "weekly"
   - package-ecosystem: "github-actions"
@@ -19,7 +19,7 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: 4.1.x
+    target-branch: 4.2.x
     ignore:
       # only upgrade patch versions for maintenance branch
       - dependency-name: "*"
@@ -30,7 +30,7 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: 4.2.x
+    target-branch: 4.3.x
     ignore:
       # only upgrade patch versions for maintenance branch
       - dependency-name: "*"
@@ -42,11 +42,6 @@ updates:
     schedule:
       interval: daily
     target-branch: main
-    ignore:
-      # only upgrade by minor or patch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
   - package-ecosystem: npm
     target-branch: docs-build
     directory: /
@@ -58,12 +53,12 @@ updates:
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    target-branch: 4.1.x
+    target-branch: 4.2.x
     directory: /docs
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    target-branch: 4.2.x
+    target-branch: 4.3.x
     directory: /docs
     schedule:
       interval: weekly

.github/workflows/deploy-docs.yml

@@ -16,7 +16,7 @@ jobs:
     # if: github.repository_owner == 'spring-cloud'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: docs-build
           fetch-depth: 1

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main, 4.1.x, 4.2.x ]
+    branches: [ main, 4.3.x, 4.2.x ]
   pull_request:
-    branches: [ main, 4.1.x, 4.2.x ]
+    branches: [ main, 4.3.x, 4.2.x ]
 
 jobs:
   build:
@@ -19,9 +19,9 @@ jobs:
         java: ["17"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}

docs/package.json

@@ -1,8 +1,8 @@
 {
 	"dependencies": {
-		"antora": "3.2.0-alpha.8",
+		"antora": "3.2.0-alpha.9",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.1",
+		"@antora/collector-extension": "1.0.2",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.7",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.17"