Compare commits

...
22 Commits
Author SHA1 Message Date
spring-builds 8ebcd050c1 Bumping versions 2026-02-04 18:17:42 +00:00
Ryan Baxter 5bf52f639c Merge pull request #598 from spring-cloud/dependabot/maven/4.2.x/org.springframework.boot-spring-boot-maven-plugin-3.4.13
Bump org.springframework.boot:spring-boot-maven-plugin from 3.4.12 to 3.4.13
2026-02-04 09:28:13 -05:00
Ryan Baxter b87bb224b1 Merge pull request #599 from spring-cloud/dependabot/maven/4.2.x/org.springframework.boot-spring-boot-dependencies-3.4.13
Bump org.springframework.boot:spring-boot-dependencies from 3.4.12 to 3.4.13
2026-02-04 09:27:51 -05:00
dependabot[bot] 2a24c63053 Bump org.springframework.boot:spring-boot-dependencies
Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.4.12 to 3.4.13.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.12...v3.4.13)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-version: 3.4.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-04 09:45:21 +00:00
dependabot[bot] 2195d5f52b Bump org.springframework.boot:spring-boot-maven-plugin
Bumps [org.springframework.boot:spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) from 3.4.12 to 3.4.13.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.12...v3.4.13)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-maven-plugin
  dependency-version: 3.4.13
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-04 09:44:19 +00:00
Ryan Baxter 2a38d4a56b Add CI job 2026-02-03 16:47:30 -05:00
Ryan Baxter 005086996f Changes to support downloading Node from USW1 on Jenkins 2026-01-30 15:02:38 -05:00
Ryan Baxter a09b7a77f8 Merge pull request #591 from spring-cloud/dependabot/github_actions/4.2.x/actions/cache-5
Bump actions/cache from 4 to 5
2025-12-15 09:37:05 -05:00
dependabot[bot] 015324d20b Bump actions/cache from 4 to 5
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4...v5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-15 09:16:10 +00:00
spring-builds 040160a7f1 Bumping versions 2025-12-14 18:17:39 +00:00
spring-builds b7705671f3 Bumping versions 2025-12-11 18:16:34 +00:00
spring-builds c213290982 Bumping versions to 4.2.5-SNAPSHOT after release 2025-12-11 10:33:20 +00:00
spring-builds 5456a034b2 Going back to snapshots 2025-12-11 10:33:19 +00:00
spring-builds 8b94c5f7e7 Update SNAPSHOT to 4.2.4 2025-12-11 10:32:46 +00:00
Ryan Baxter d21087a5ea Upgrade to Spring Boot 3.4.12 2025-12-04 10:09:23 -05:00
Ryan Baxter 584d5a0ff3 Merge pull request #583 from spring-cloud/dependabot/npm_and_yarn/docs/4.2.x/antora-3.2.0-alpha.11
Bump antora from 3.2.0-alpha.10 to 3.2.0-alpha.11 in /docs
2025-12-01 08:57:44 -05:00
dependabot[bot] afa09907cd Bump antora from 3.2.0-alpha.10 to 3.2.0-alpha.11 in /docs
Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.10 to 3.2.0-alpha.11.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.10...v3.2.0-alpha.11)

---
updated-dependencies:
- dependency-name: antora
  dependency-version: 3.2.0-alpha.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 10:48:34 +00:00
Ryan Baxter bbd3219ac6 Merge pull request #578 from spring-cloud/dependabot/github_actions/4.2.x/actions/checkout-6 2025-11-24 07:46:08 -05:00
dependabot[bot] 32c2672454 Bump actions/checkout from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [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/v5...v6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 09:41:33 +00:00
spring-builds fbaf9cb7c6 Bumping versions 2025-10-16 18:17:49 +00:00
spring-builds 769be1d42b Bumping versions to 4.2.4-SNAPSHOT after release 2025-10-15 18:54:44 +00:00
spring-builds 3b15d1b103 Going back to snapshots 2025-10-15 18:54:43 +00:00
9 changed files with 54 additions and 13 deletions
+34
View File
@@ -0,0 +1,34 @@
name: Spring Cloud Build CI Job
on:
push:
branches:
- main
- 4.3.x
- 4.2.x
# Scheduled builds run daily at midnight UTC
schedule:
- cron: '0 0 * * *'
# Manual trigger with optional branch override
workflow_dispatch:
inputs:
branches:
description: "Which branch should be built (can be a comma-separated list of branches)"
required: true
default: '4.2.x'
type: string
jobs:
deploy:
uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@main
with:
branches: ${{ inputs.branches }}
secrets:
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
COMMERCIAL_ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
COMMERCIAL_ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
# if: github.repository_owner == 'spring-projects'
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
ref: docs-build
fetch-depth: 1
+2 -2
View File
@@ -15,14 +15,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- 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@v4
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"dependencies": {
"antora": "3.2.0-alpha.10",
"antora": "3.2.0-alpha.11",
"@antora/atlas-extension": "1.0.0-alpha.5",
"@antora/collector-extension": "1.0.2",
"@asciidoctor/tabs": "1.0.0-beta.6",
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.3</version>
<version>4.2.5-SNAPSHOT</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+10 -3
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.3</version>
<version>4.2.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.4.7</spring-boot.version>
<spring-cloud-build.version>4.2.3</spring-cloud-build.version>
<spring-boot.version>3.4.13</spring-boot.version>
<spring-cloud-build.version>4.2.5-SNAPSHOT</spring-cloud-build.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
@@ -144,6 +144,7 @@
<generate-readme.phase>prepare-package</generate-readme.phase>
<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
<node-download-url>https://nodejs.org/dist</node-download-url>
</properties>
<dependencyManagement>
<dependencies>
@@ -1088,6 +1089,12 @@
<configuration>
<!-- TODO: remove when CI upgrades past ubuntu 1804 -->
<nodeVersion>${node.version}</nodeVersion>
<!-- The default value for node-download-url is set in the properties of this POM -->
<!-- This can be overriden in the Maven settings.xml or via the command line -->
<!-- On Jenkins we override this property in Maven settings.xml to point to USW1 to download Node -->
<!-- When pointing to USW1 we use the serverId spring-commercial-release in settings.xml to authenticate with USW1 -->
<nodeDownloadUrl>${node-download-url}</nodeDownloadUrl>
<nodeDownloadServerId>spring-commercial-release</nodeDownloadServerId>
<options>
<option>--to-dir=target/antora/site</option>
<option>--stacktrace</option>
+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.2.3</version>
<version>4.2.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.4.7</version>
<version>3.4.13</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.7</spring-boot.version>
<spring-boot.version>3.4.13</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.2.3</version>
<version>4.2.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.2.3</version>
<version>4.2.5-SNAPSHOT</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>