Compare commits

...
79 Commits
Author SHA1 Message Date
spring-builds 90fd4076f8 Update SNAPSHOT to 4.1.6 2025-06-20 22:49:16 +00:00
Ryan Baxter ca3bf4e180 Fix maven central plugin 2025-06-20 18:45:27 -04:00
Ryan Baxter ba5d98cc21 Adding settings.xml 2025-06-20 17:04:25 -04:00
Ryan Baxter 3b6f9b6079 Fixing settings.xml 2025-06-20 16:57:53 -04:00
Ryan Baxter 9ed0a08902 Revert "Use local settings.xml"
This reverts commit e7363a48a0.
2025-06-20 16:40:38 -04:00
Ryan Baxter b6cc286bbd Adding settings.xml 2025-06-20 16:40:16 -04:00
Ryan Baxter e7363a48a0 Use local settings.xml 2025-06-20 16:31:06 -04:00
Ryan Baxter c8bacd12d3 Merge branch '4.1.x' of github.com:spring-cloud/spring-cloud-build into 4.1.x 2025-06-20 16:19:54 -04:00
Ryan Baxter e127e1e4ce Changes to push to maven central 2025-06-20 16:19:49 -04:00
spring-builds cb87ff456e Bumping versions 2025-06-19 14:45:12 +00:00
spring-builds a61a305a91 Bumping versions 2025-06-16 21:46:14 +00:00
Ryan Baxter 3814f0d458 Upgrading GPG version 2025-06-09 14:50:08 -04:00
Ryan Baxter f2aea26210 Merge pull request #464 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-checkstyle-0.0.46
Bump io.spring.javaformat:spring-javaformat-checkstyle from 0.0.45 to 0.0.46
2025-06-03 09:45:14 -04:00
Ryan Baxter d649a78e34 Merge pull request #465 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-maven-plugin-0.0.46
Bump io.spring.javaformat:spring-javaformat-maven-plugin from 0.0.45 to 0.0.46
2025-06-03 09:44:35 -04:00
dependabot[bot] b7add7c94c Bump io.spring.javaformat:spring-javaformat-maven-plugin
Bumps [io.spring.javaformat:spring-javaformat-maven-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-maven-plugin
  dependency-version: 0.0.46
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-03 09:14:59 +00:00
dependabot[bot] 8cb432db8e Bump io.spring.javaformat:spring-javaformat-checkstyle
Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.45 to 0.0.46.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.45...v0.0.46)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-checkstyle
  dependency-version: 0.0.46
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-03 09:14:48 +00:00
spring-builds 180003d676 Bumping versions 2025-05-22 21:45:48 +00:00
spring-builds e0383c17b1 Bumping versions 2025-05-22 13:26:03 +00:00
spring-builds 384c00ff92 Bumping versions 2025-05-21 20:00:59 +00:00
spring-builds 6617c48cca Bumping versions 2025-05-21 19:52:58 +00:00
Ryan Baxter 6d48619341 Merge pull request #461 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-maven-plugin-0.0.45
Bump io.spring.javaformat:spring-javaformat-maven-plugin from 0.0.43 to 0.0.45
2025-05-20 09:51:54 -04:00
Ryan Baxter a544afed6a Merge pull request #460 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-checkstyle-0.0.45
Bump io.spring.javaformat:spring-javaformat-checkstyle from 0.0.44 to 0.0.45
2025-05-20 09:51:20 -04:00
dependabot[bot] 4e5cacb82d Bump io.spring.javaformat:spring-javaformat-maven-plugin
Bumps [io.spring.javaformat:spring-javaformat-maven-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.45.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.45)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-maven-plugin
  dependency-version: 0.0.45
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-20 10:11:39 +00:00
dependabot[bot] ae61cf47f5 Bump io.spring.javaformat:spring-javaformat-checkstyle
Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.44 to 0.0.45.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.44...v0.0.45)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-checkstyle
  dependency-version: 0.0.45
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-20 10:11:28 +00:00
Ryan Baxter cf47148eea Revert spring-javaformat plugin version 2025-05-15 09:26:23 -04:00
Ryan Baxter 88f2c29030 Merge pull request #449 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-checkstyle-0.0.44
Bump io.spring.javaformat:spring-javaformat-checkstyle from 0.0.43 to 0.0.44
2025-05-15 09:00:11 -04:00
Ryan Baxter 8f581d47e3 Merge pull request #450 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-maven-plugin-0.0.44
Bump io.spring.javaformat:spring-javaformat-maven-plugin from 0.0.43 to 0.0.44
2025-05-15 08:58:26 -04:00
dependabot[bot] 9ac6230249 Bump io.spring.javaformat:spring-javaformat-maven-plugin
Bumps [io.spring.javaformat:spring-javaformat-maven-plugin](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.44.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.44)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-maven-plugin
  dependency-version: 0.0.44
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-15 09:41:30 +00:00
dependabot[bot] 2f27262694 Bump io.spring.javaformat:spring-javaformat-checkstyle
Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.43 to 0.0.44.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.43...v0.0.44)

---
updated-dependencies:
- dependency-name: io.spring.javaformat:spring-javaformat-checkstyle
  dependency-version: 0.0.44
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-15 09:41:22 +00:00
Ryan Baxter b6f6a46759 Merge pull request #444 from wind57/fix_junit_asserj_checkstyle
fix checkstyle junit vs assertj
2025-04-10 08:23:21 -04:00
wind57 443f34b1f1 fix checkstyle junit vs assertj
Signed-off-by: wind57 <eugen.rabii@gmail.com>
2025-04-10 14:23:07 +03:00
Ryan Baxter 29fa75104a Merge pull request #442 from spring-cloud/dependabot/maven/4.1.x/org.jacoco-jacoco-maven-plugin-0.8.13
Bump org.jacoco:jacoco-maven-plugin from 0.8.12 to 0.8.13
2025-04-03 09:01:01 -04:00
dependabot[bot] e917607c82 Bump org.jacoco:jacoco-maven-plugin from 0.8.12 to 0.8.13
Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.12 to 0.8.13.
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.12...v0.8.13)

---
updated-dependencies:
- dependency-name: org.jacoco:jacoco-maven-plugin
  dependency-version: 0.8.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-03 09:54:36 +00:00
Ryan Baxter 0aced63629 Merge pull request #423 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/antora-extensions-1.14.4
Bump @springio/antora-extensions from 1.14.2 to 1.14.4 in /docs
2025-03-25 15:45:43 -04:00
dependabot[bot] 175007f3e8 Bump @springio/antora-extensions from 1.14.2 to 1.14.4 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.14.2 to 1.14.4.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.14.2...v1.14.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-24 19:46:39 +00:00
Ryan Baxter 1b7fba3b2d Merge pull request #434 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/asciidoctor-extensions-1.0.0-alpha.17
Bump @springio/asciidoctor-extensions from 1.0.0-alpha.16 to 1.0.0-alpha.17 in /docs
2025-03-24 15:45:22 -04:00
dependabot[bot] 302a8f0b2e Bump @springio/asciidoctor-extensions in /docs
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.16 to 1.0.0-alpha.17.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.16...v1.0.0-alpha.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-24 10:21:46 +00:00
spring-builds eae7f506ba Bumping versions 2025-03-12 21:45:43 +00:00
Ryan Baxter ba4dde9e94 Merge pull request #409 from spring-cloud/dependabot/maven/4.1.x/commons-logging-commons-logging-1.3.5
Bump commons-logging:commons-logging from 1.3.4 to 1.3.5
2025-02-10 08:50:45 -05:00
dependabot[bot] a22657bafc Bump commons-logging:commons-logging from 1.3.4 to 1.3.5
Bumps commons-logging:commons-logging from 1.3.4 to 1.3.5.

---
updated-dependencies:
- dependency-name: commons-logging:commons-logging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-10 09:39:43 +00:00
Ryan Baxter f925480eaf Merge pull request #400 from spring-cloud/dependabot/maven/4.1.x/org.antora-antora-maven-plugin-1.0.0-alpha.5
Bump org.antora:antora-maven-plugin from 1.0.0-alpha.4 to 1.0.0-alpha.5
2025-02-05 09:26:26 -05:00
dependabot[bot] 08cc35f21f Bump org.antora:antora-maven-plugin from 1.0.0-alpha.4 to 1.0.0-alpha.5
---
updated-dependencies:
- dependency-name: org.antora:antora-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-05 10:05:46 +00:00
Ryan Baxter fbc2042e0e Reverting JRuby upgrade 2025-02-04 10:26:24 -05:00
Ryan Baxter 8afa797a2e Merge pull request #392 from spring-cloud/dependabot/maven/4.1.x/org.jruby-jruby-complete-9.4.11.0
Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0
2025-02-03 10:42:16 -05:00
dependabot[bot] 6d41d203ee Bump org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0
Bumps org.jruby:jruby-complete from 9.4.8.0 to 9.4.11.0.

---
updated-dependencies:
- dependency-name: org.jruby:jruby-complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 15:40:24 +00:00
Ryan Baxter 0663022a86 Update maven.yml
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:38:05 -05:00
Ryan Baxter 0dd547bbb4 Update maven.yml
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:37:51 -05:00
Ryan Baxter 53a38463c3 Merge pull request #391 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/asciidoctor-extensions-1.0.0-alpha.16
Bump @springio/asciidoctor-extensions from 1.0.0-alpha.14 to 1.0.0-alpha.16 in /docs
2025-02-03 10:35:12 -05:00
dependabot[bot] 2ba1c83c53 Bump @springio/asciidoctor-extensions in /docs
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.14 to 1.0.0-alpha.16.
- [Changelog](https://github.com/spring-io/asciidoctor-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/asciidoctor-extensions/compare/v1.0.0-alpha.14...v1.0.0-alpha.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-03 09:54:02 +00:00
Ryan Baxter 723663f5f5 Updating README with DCO 2025-01-16 11:00:35 -05:00
Ryan Baxter 2336c6dedb Changing CLA to DCO 2025-01-16 10:45:07 -05:00
Spencer Gibb 7e4315ed3c Create dco.yml 2025-01-16 10:44:32 -05:00
spring-builds 1955e62152 Bumping versions to 4.1.6-SNAPSHOT after release 2025-01-09 23:04:24 +00:00
spring-builds a47fdeca01 Going back to snapshots 2025-01-09 23:04:23 +00:00
spring-builds 9247268a01 Update SNAPSHOT to 4.1.5 2025-01-09 23:03:40 +00:00
Ryan Baxter c3c8a70a45 Merge pull request #383 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora-3.2.0-alpha.8
Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs
2024-12-09 08:50:28 -05:00
Ryan Baxter a3c81bea2c Merge pull request #384 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora/collector-extension-1.0.1
Bump @antora/collector-extension from 1.0.0 to 1.0.1 in /docs
2024-12-09 08:49:58 -05:00
dependabot[bot] 72d097b9d4 Bump @antora/collector-extension from 1.0.0 to 1.0.1 in /docs
---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-09 09:37:59 +00:00
dependabot[bot] 519f8b1ce7 Bump antora from 3.2.0-alpha.6 to 3.2.0-alpha.8 in /docs
Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.6 to 3.2.0-alpha.8.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.6...v3.2.0-alpha.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-09 09:37:56 +00:00
Ryan Baxter 818fdf8680 Merge pull request #379 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora/collector-extension-1.0.0
Bump @antora/collector-extension from 1.0.0-rc.1 to 1.0.0 in /docs
2024-12-02 08:43:31 -05:00
dependabot[bot] 3452f7ef30 Bump @antora/collector-extension from 1.0.0-rc.1 to 1.0.0 in /docs
---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-02 10:08:43 +00:00
spring-builds 05d62927e8 Bumping dependency versions after release 2024-11-26 23:55:25 +00:00
spring-builds 6224049d86 Bumping versions to 4.1.5-SNAPSHOT after release 2024-11-26 23:54:46 +00:00
spring-builds 1f72bedc58 Going back to snapshots 2024-11-26 23:54:45 +00:00
spring-builds f461511f59 Update SNAPSHOT to 4.1.4 2024-11-26 23:54:12 +00:00
spring-builds 7de1ad71b0 Bumping versions 2024-11-26 21:46:00 +00:00
spring-builds 23a6cde46a Bumping dependency versions after release 2024-11-25 23:30:09 +00:00
spring-builds 300bb73736 Bumping versions to 4.1.5-SNAPSHOT after release 2024-11-25 23:29:16 +00:00
spring-builds bd1f12eafb Going back to snapshots 2024-11-25 23:29:16 +00:00
spring-builds d0a70a6041 Update SNAPSHOT to 4.1.4 2024-11-25 23:28:37 +00:00
Ryan Baxter bed77d0860 Merge pull request #375 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora/collector-extension-1.0.0-rc.1
Bump @antora/collector-extension from 1.0.0-beta.5 to 1.0.0-rc.1 in /docs
2024-11-25 08:37:03 -05:00
dependabot[bot] a2f97093bb Bump @antora/collector-extension in /docs
---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-25 10:06:01 +00:00
spring-builds f8252da76f Bumping versions 2024-11-19 21:45:45 +00:00
Ryan Baxter 878fc6fcba Merge pull request #371 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora/collector-extension-1.0.0-beta.5
Bump @antora/collector-extension from 1.0.0-beta.4 to 1.0.0-beta.5 in /docs
2024-11-18 08:32:41 -05:00
dependabot[bot] df8b2f19be Bump @antora/collector-extension in /docs
---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-18 09:52:56 +00:00
spring-builds 92798697df Bumping versions 2024-11-14 16:43:49 +00:00
spring-builds 364d666b28 Bumping versions 2024-11-11 19:48:22 +00:00
Ryan Baxter 117302da66 Merge pull request #368 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora/collector-extension-1.0.0-beta.4
Bump @antora/collector-extension from 1.0.0-beta.3 to 1.0.0-beta.4 in /docs
2024-11-04 08:41:29 -05:00
dependabot[bot] f88c16d507 Bump @antora/collector-extension in /docs
---
updated-dependencies:
- dependency-name: "@antora/collector-extension"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-04 10:01:01 +00:00
12 changed files with 90 additions and 67 deletions
+2
View File
@@ -0,0 +1,2 @@
require:
members: false
+3 -3
View File
@@ -5,9 +5,9 @@ name: Build
on:
push:
branches: [ main, 3.1.x ]
branches: [ main, 4.1.x, 3.1.x ]
pull_request:
branches: [ main, 3.1.x ]
branches: [ main, 4.1.x, 3.1.x ]
jobs:
build:
@@ -29,4 +29,4 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Build with Maven
run: ./mvnw clean install -B -U -Pspring
run: ./mvnw clean install -Pdocs -B -U -Pspring
+11 -14
View File
@@ -45,21 +45,17 @@ tracker for issues and merging pull requests into main. If you want
to contribute even something trivial please do not hesitate, but
follow the guidelines below.
[[sign-the-contributor-license-agreement]]
== Sign the Contributor License Agreement
[[developer-certificate-of-origin]]
== Developer Certificate of Origin (DCO)
Before we accept a non-trivial patch or pull request we will need you to sign the
https://cla.pivotal.io/sign/spring[Contributor License Agreement].
Signing the contributor's agreement does not grant anyone commit rights to the main
repository, but it does mean that we can accept your contributions, and you will get an
author credit if we do. Active contributors might be asked to join the core team, and
given the ability to merge pull requests.
All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin.
For additional details, please refer to the blog post https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring].
[[code-of-conduct]]
== Code of Conduct
This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of
This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc[code of
conduct]. By participating, you are expected to uphold this code. Please report
unacceptable behavior to spring-code-of-conduct@pivotal.io.
unacceptable behavior to code-of-conduct@spring.io.
[[code-conventions-and-housekeeping]]
== Code Conventions and Housekeeping
@@ -152,7 +148,7 @@ Checkstyle rules are *disabled by default*. To add checkstyle to your project ju
If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
.projectRoot/src/checkstyle/checkstyle-suppresions.xml
.projectRoot/src/checkstyle/checkstyle-suppressions.xml
----
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
@@ -166,10 +162,11 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
```bash
[source,bash]
----
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/.editorconfig -o .editorconfig
$ touch .springformat
```
----
[[ide-setup]]
== IDE setup
@@ -233,7 +230,7 @@ Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, th
[[duplicate-finder-configuration]]
=== Duplicate Finder configuration
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the project's `pom.xml`.
.pom.xml
[source,xml]
+4 -8
View File
@@ -6,15 +6,11 @@ tracker for issues and merging pull requests into main. If you want
to contribute even something trivial please do not hesitate, but
follow the guidelines below.
[[sign-the-contributor-license-agreement]]
== Sign the Contributor License Agreement
[[developer-certificate-of-origin]]
== Developer Certificate of Origin (DCO)
Before we accept a non-trivial patch or pull request we will need you to sign the
https://cla.pivotal.io/sign/spring[Contributor License Agreement].
Signing the contributor's agreement does not grant anyone commit rights to the main
repository, but it does mean that we can accept your contributions, and you will get an
author credit if we do. Active contributors might be asked to join the core team, and
given the ability to merge pull requests.
All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin.
For additional details, please refer to the blog post https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring].
[[code-of-conduct]]
== Code of Conduct
+4 -4
View File
@@ -1,10 +1,10 @@
{
"dependencies": {
"antora": "3.2.0-alpha.6",
"antora": "3.2.0-alpha.8",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.0-beta.3",
"@antora/collector-extension": "1.0.1",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.2",
"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
"@springio/antora-extensions": "1.14.4",
"@springio/asciidoctor-extensions": "1.0.0-alpha.17"
}
}
+2 -2
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.4-SNAPSHOT</version>
<version>4.1.6</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
@@ -32,7 +32,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.4</version>
<version>1.3.5</version>
<scope>compile</scope>
</dependency>
<dependency>
+29 -15
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.4-SNAPSHOT</version>
<version>4.1.6</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.2.8</spring-boot.version>
<spring-cloud-build.version>4.1.4-SNAPSHOT</spring-cloud-build.version>
<spring-boot.version>3.3.13</spring-boot.version>
<spring-cloud-build.version>4.1.6</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>
@@ -40,7 +40,7 @@
<guides-update.phase>deploy</guides-update.phase>
<revision>${project.version}</revision>
<asciidoctorj.version>2.5.13</asciidoctorj.version>
<jruby-complete.version>9.4.8.0</jruby-complete.version>
<jruby-complete.version>9.4.9.0</jruby-complete.version>
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -55,7 +55,7 @@
<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
<puppycrawl-tools-checkstyle.version>9.3</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.43</spring-javaformat.version>
<spring-javaformat.version>0.0.46</spring-javaformat.version>
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -69,13 +69,13 @@
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
<artifactory-maven-plugin.version>3.2.3</artifactory-maven-plugin.version>
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<spring-javaformat-checkstyle.version>0.0.43</spring-javaformat-checkstyle.version>
<spring-javaformat-checkstyle.version>0.0.46</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
<pitest-maven.version>1.16.3</pitest-maven.version>
<pitest-junit5-plugin.version>0.16</pitest-junit5-plugin.version>
@@ -139,11 +139,12 @@
<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
<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.4</org-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>
<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>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -700,7 +701,12 @@
<includePomProjects>${duplicate-finder-maven-plugin.includePomProjects}</includePomProjects>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
</build>
@@ -749,11 +755,6 @@
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
</url>
</site>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>repo.spring.io</id>
<name>Spring Snapshot Repository</name>
@@ -849,6 +850,19 @@
</goals>
</execution>
</executions>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
@@ -1297,7 +1311,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<version>0.8.13</version>
<configuration>
<destFile>${sonar.jacoco.reportPath}</destFile>
<append>true</append>
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash
./mvnw clean install -B -Pdocs ${@}
./mvnw clean install -s .settings.xml -B -Pdocs ${@}
#./mvnw clean install -B -DskipTests ${@}
+17 -10
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>4.1.4-SNAPSHOT</version>
<version>4.1.6</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,13 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.2.8</version>
<version>3.3.13</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.2.8</spring-boot.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<spring-boot.version>3.3.13</spring-boot.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<build>
<plugins>
@@ -96,12 +97,6 @@
<name>Sonatype Nexus Snapshots</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
<build>
<plugins>
@@ -118,6 +113,18 @@
</goals>
</execution>
</executions>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.4-SNAPSHOT</version>
<version>4.1.6</version>
</parent>
<dependencies>
<dependency>
@@ -167,7 +167,7 @@
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="maximum" value="0"/>
<property name="format"
value="org\.junit\.(Assert|jupiter\.api\.Assertions)\.assert"/>
value="org\.junit\.(Assert|jupiter\.api\.Assertions)"/>
<property name="message"
value="Please use AssertJ imports."/>
<property name="ignoreComments" value="true"/>
+15 -8
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.1.4-SNAPSHOT</version>
<version>4.1.6</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>
@@ -70,6 +70,7 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<distributionManagement>
<downloadUrl>https://github.com/spring-cloud</downloadUrl>
@@ -109,12 +110,6 @@
<name>Sonatype Nexus Snapshots</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
<build>
<plugins>
@@ -154,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.7</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -164,6 +159,18 @@
</goals>
</execution>
</executions>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>