Compare commits

...
23 Commits
Author SHA1 Message Date
Ryan Baxter 0f6c60f597 Merge pull request #656 from spring-cloud/dependabot/github_actions/4.3.x/actions/checkout-7 2026-06-19 06:07:52 -04:00
dependabot[bot] 093aad7a7f Bump actions/checkout from 6 to 7
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-06-19 09:43:29 +00:00
spring-builds 50263b64bf Bumping versions 2026-06-12 13:04:41 +00:00
spring-builds 0584d7e3ca Bumping versions 2026-06-11 13:03:40 +00:00
spring-builds 927f410513 Bumping dependency versions after release 2026-06-11 07:40:26 +00:00
spring-builds 0412514849 Bumping versions to 4.3.5-SNAPSHOT after release 2026-06-11 07:38:54 +00:00
spring-builds 12203b8948 Going back to snapshots 2026-06-11 07:38:53 +00:00
spring-builds 7d614a4ffe Update SNAPSHOT to 4.3.4 2026-06-11 07:38:16 +00:00
Ryan Baxter fbb97daee5 Merge pull request #652 from spring-cloud/dependabot/npm_and_yarn/docs/4.3.x/springio/antora-extensions-1.14.12
Bump @springio/antora-extensions from 1.14.11 to 1.14.12 in /docs
2026-06-01 09:17:01 -04:00
dependabot[bot] e806e677a3 Bump @springio/antora-extensions from 1.14.11 to 1.14.12 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.11 to 1.14.12.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.11...v1.14.12)

---
updated-dependencies:
- dependency-name: "@springio/antora-extensions"
  dependency-version: 1.14.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-29 10:34:28 +00:00
Ryan Baxter 56c12f8fdb Merge pull request #647 from jonatan-ivanov/add-antora-command
Add command to generate the docs site
2026-05-27 19:21:47 -04:00
Jonatan Ivanov e4e3763b8f Add command to generate the docs site 2026-05-27 14:46:32 -07:00
Ryan Baxter 77b332710b Upgrade node version to v22.22.0 2026-05-15 16:59:27 -04:00
Ryan Baxter c7d4922635 Bump Spring Boot to 3.5.15-SNAPSHOT 2026-05-05 09:54:38 -04:00
Ryan Baxter 986377cdf8 Merge pull request #636 from spring-cloud/dependabot/npm_and_yarn/docs/4.3.x/springio/antora-extensions-1.14.11 2026-04-10 07:37:34 -04:00
dependabot[bot] 92329f3736 Bump @springio/antora-extensions from 1.14.10 to 1.14.11 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.10 to 1.14.11.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.10...v1.14.11)

---
updated-dependencies:
- dependency-name: "@springio/antora-extensions"
  dependency-version: 1.14.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-10 10:35:35 +00:00
Ryan Baxter a4fec9472e Merge pull request #635 from ryanjbaxter/use-new-pr-workflow
Use new PR workflow
2026-04-09 20:26:56 -04:00
Ryan Baxter 76f3428c49 Use new PR workflow 2026-04-09 19:49:49 -04:00
Ryan Baxter 15a2ddac7a Merge pull request #634 from spring-cloud/dependabot/npm_and_yarn/docs/4.3.x/springio/antora-extensions-1.14.10
Bump @springio/antora-extensions from 1.14.9 to 1.14.10 in /docs
2026-04-03 09:08:18 -04:00
dependabot[bot] 76f2ed2189 Bump @springio/antora-extensions from 1.14.9 to 1.14.10 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.9 to 1.14.10.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.9...v1.14.10)

---
updated-dependencies:
- dependency-name: "@springio/antora-extensions"
  dependency-version: 1.14.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-03 09:44:08 +00:00
spring-builds 59eb16e44d Bumping dependency versions after release 2026-04-01 19:11:41 +00:00
spring-builds d9c57e9939 Bumping versions to 4.3.4-SNAPSHOT after release 2026-04-01 19:10:28 +00:00
spring-builds ea6bcdee6f Going back to snapshots 2026-04-01 19:10:27 +00:00
10 changed files with 29 additions and 43 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
# if: github.repository_owner == 'spring-projects'
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
ref: docs-build
fetch-depth: 1
-30
View File
@@ -1,30 +0,0 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
name: Build
on:
pull_request:
branches: [ main, 4.3.x, 4.2.x ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- name: Set up JDK
uses: actions/setup-java@v5
with:
java-version: 17
distribution: 'temurin'
- name: Cache local Maven repository
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build with Maven
run: ./mvnw clean install -Pdocs -B -U -Pspring
+9
View File
@@ -0,0 +1,9 @@
name: PR
on:
pull_request:
branches: [ 4.3.x ]
jobs:
build:
uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@main
+7
View File
@@ -42,6 +42,13 @@ parsing or rendering it, just copying it to `${main.basedir}`
any changes in the README it will then show up after a Maven build as
a modified file in the correct place. Just commit it and push the change.
You can generate the docs site using the following command:
[indent=0]
----
./mvnw -pl docs -P docs antora:antora
----
[[working-with-the-code]]
== Working with the code
If you don't have an IDE preference we would recommend that you use
+2 -2
View File
@@ -1,10 +1,10 @@
{
"dependencies": {
"antora": "3.2.0-alpha.11",
"antora": "3.2.0-alpha.12",
"@antora/atlas-extension": "1.0.0-alpha.5",
"@antora/collector-extension": "1.0.3",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.9",
"@springio/antora-extensions": "1.14.12",
"@springio/asciidoctor-extensions": "1.0.0-alpha.18"
}
}
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.3.3</version>
<version>4.3.5-SNAPSHOT</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+4 -4
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.3.3</version>
<version>4.3.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>3.5.13</spring-boot.version>
<spring-cloud-build.version>4.3.3</spring-cloud-build.version>
<spring-boot.version>3.5.15</spring-boot.version>
<spring-cloud-build.version>4.3.5-SNAPSHOT</spring-cloud-build.version>
<kotlin.version>1.9.25</kotlin.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
@@ -140,7 +140,7 @@
<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
<antora-maven-plugin.version>0.0.4</antora-maven-plugin.version>
<org-antora-maven-plugin.version>1.0.0-alpha.5</org-antora-maven-plugin.version>
<node.version>v16.20.2</node.version>
<node.version>v22.22.0</node.version>
<antora-maven-plugin.phase>prepare-package</antora-maven-plugin.phase>
<generate-readme.phase>prepare-package</generate-readme.phase>
<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
+3 -3
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>4.3.3</version>
<version>4.3.5-SNAPSHOT</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,12 +14,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.5.13</version>
<version>3.5.15</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.5.13</spring-boot.version>
<spring-boot.version>3.5.15</spring-boot.version>
<okhttp.version>4.12.0</okhttp.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.3.3</version>
<version>4.3.5-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
+1 -1
View File
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<version>4.3.3</version>
<version>4.3.5-SNAPSHOT</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>