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

Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	.github/workflows/maven.yml
This commit is contained in:
Olga Maciaszek-Sharma
2025-09-11 14:53:11 +02:00
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -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
+4 -4
View File
@@ -5,9 +5,9 @@ name: Build
on:
push:
branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
branches: [ main, 4.3.x, 4.2.x ]
pull_request:
branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
branches: [ main, 4.3.x, 4.2.x ]
jobs:
build:
@@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up JDK
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
+3 -3
View File
@@ -1,8 +1,8 @@
{
"dependencies": {
"antora": "3.2.0-alpha.8",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.1",
"antora": "3.2.0-alpha.9",
"@antora/atlas-extension": "1.0.0-alpha.5",
"@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"