Compare commits

..
45 Commits
Author SHA1 Message Date
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
Olga Maciaszek-Sharma 9437a1a06d Merge pull request #358 from spring-cloud/4.1.x-avoid-case-change-without-locale
Add case change without locale checkstyle rule.
2024-10-17 15:36:26 +02:00
Olga Maciaszek-Sharma bfa1ccfc21 Add case change without locale checkstyle rule. 2024-10-17 11:07:37 +02:00
Ryan Baxter 55bdc73363 Merge pull request #355 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/antora/collector-extension-1.0.0-beta.3
Bump @antora/collector-extension from 1.0.0-alpha.7 to 1.0.0-beta.3 in /docs
2024-10-14 07:59:01 -04:00
dependabot[bot] 4f9b833cc4 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-10-14 10:06:26 +00:00
Ryan Baxter 0f169a35c4 Merge pull request #348 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/asciidoctor-extensions-1.0.0-alpha.14
Bump @springio/asciidoctor-extensions from 1.0.0-alpha.13 to 1.0.0-alpha.14 in /docs
2024-09-23 08:58:09 -04:00
dependabot[bot] bd47052813 Bump @springio/asciidoctor-extensions in /docs
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.13 to 1.0.0-alpha.14.
- [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.13...v1.0.0-alpha.14)

---
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>
2024-09-23 09:46:03 +00:00
Ryan Baxter 932861a8d9 Merge pull request #326 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/asciidoctor-extensions-1.0.0-alpha.13
Bump @springio/asciidoctor-extensions from 1.0.0-alpha.12 to 1.0.0-alpha.13 in /docs
2024-09-09 08:35:12 -04:00
dependabot[bot] 26c9612f0c Bump @springio/asciidoctor-extensions in /docs
Bumps [@springio/asciidoctor-extensions](https://github.com/spring-io/asciidoctor-extensions) from 1.0.0-alpha.12 to 1.0.0-alpha.13.
- [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.12...v1.0.0-alpha.13)

---
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>
2024-09-09 10:09:27 +00:00
Ryan Baxter 09d6216b4d Merge pull request #323 from spring-cloud/dependabot/maven/4.1.x/org.pitest-pitest-maven-1.16.3
Bump org.pitest:pitest-maven from 1.16.2 to 1.16.3
2024-09-03 08:47:49 -04:00
dependabot[bot] eb01f879e7 Bump org.pitest:pitest-maven from 1.16.2 to 1.16.3
Bumps [org.pitest:pitest-maven](https://github.com/hcoles/pitest) from 1.16.2 to 1.16.3.
- [Release notes](https://github.com/hcoles/pitest/releases)
- [Commits](https://github.com/hcoles/pitest/compare/1.16.2...1.16.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-03 10:04:38 +00:00
Ryan Baxter 2dc834f469 Merge pull request #321 from spring-cloud/dependabot/maven/4.1.x/org.pitest-pitest-maven-1.16.2
Bump org.pitest:pitest-maven from 1.16.1 to 1.16.2
2024-08-29 11:23:16 -04:00
dependabot[bot] a7b4391dde Bump org.pitest:pitest-maven from 1.16.1 to 1.16.2
Bumps [org.pitest:pitest-maven](https://github.com/hcoles/pitest) from 1.16.1 to 1.16.2.
- [Release notes](https://github.com/hcoles/pitest/releases)
- [Commits](https://github.com/hcoles/pitest/compare/1.16.1...1.16.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-29 10:07:38 +00:00
Ryan Baxter d6372ef356 Merge pull request #314 from spring-cloud/dependabot/npm_and_yarn/docs/4.1.x/springio/antora-extensions-1.14.2
Bump @springio/antora-extensions from 1.13.0 to 1.14.2 in /docs
2024-08-20 09:37:52 -04:00
dependabot[bot] e6f3341c29 Bump @springio/antora-extensions from 1.13.0 to 1.14.2 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.13.0 to 1.14.2.
- [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/spring-io/antora-extensions/compare/v1.13.0...v1.14.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-20 12:07:58 +00:00
Ryan Baxter 8ac725e6fd Merge pull request #311 from spring-cloud/dependabot/maven/4.1.x/commons-logging-commons-logging-1.3.4
Bump commons-logging:commons-logging from 1.3.3 to 1.3.4
2024-08-20 08:05:47 -04:00
dependabot[bot] 8788de4729 Bump commons-logging:commons-logging from 1.3.3 to 1.3.4
Bumps commons-logging:commons-logging from 1.3.3 to 1.3.4.

---
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>
2024-08-20 09:28:53 +00:00
Ryan Baxter bdab430d85 Merge pull request #303 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-maven-plugin-0.0.43
Bump io.spring.javaformat:spring-javaformat-maven-plugin from 0.0.42 to 0.0.43
2024-08-14 08:06:22 -04:00
Ryan Baxter 3f5e6503ac Merge pull request #304 from spring-cloud/dependabot/maven/4.1.x/io.spring.javaformat-spring-javaformat-checkstyle-0.0.43
Bump io.spring.javaformat:spring-javaformat-checkstyle from 0.0.42 to 0.0.43
2024-08-14 08:05:26 -04:00
dependabot[bot] fb286d2937 Bump io.spring.javaformat:spring-javaformat-checkstyle
Bumps [io.spring.javaformat:spring-javaformat-checkstyle](https://github.com/spring-io/spring-javaformat) from 0.0.42 to 0.0.43.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.42...v0.0.43)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 09:34:25 +00:00
dependabot[bot] ec11d9cfff 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.42 to 0.0.43.
- [Release notes](https://github.com/spring-io/spring-javaformat/releases)
- [Commits](https://github.com/spring-io/spring-javaformat/compare/v0.0.42...v0.0.43)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 09:34:15 +00:00
9 changed files with 33 additions and 28 deletions
-11
View File
@@ -20,17 +20,6 @@ updates:
- dependency-name: "*"
update-types:
- version-update:semver-major
- package-ecosystem: maven
directory: /
schedule:
interval: daily
target-branch: 4.1.x
ignore:
# only upgrade by minor or patch
- dependency-name: "*"
update-types:
- version-update:semver-major
- version-update:semver-minor
- package-ecosystem: npm
target-branch: docs-build
directory: /
+2 -2
View File
@@ -57,9 +57,9 @@ given the ability to merge pull requests.
[[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
+3 -3
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.2",
"@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.12"
"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
}
}
+2 -2
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.0-M1</version>
<version>4.1.5</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.3</version>
<version>1.3.4</version>
<scope>compile</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.0-M1</version>
<version>4.1.5</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.0-M1</spring-boot.version>
<spring-cloud-build.version>4.2.0-M1</spring-cloud-build.version>
<spring-boot.version>3.2.12</spring-boot.version>
<spring-cloud-build.version>4.1.5</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>
@@ -64,7 +64,7 @@
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
<exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
@@ -77,7 +77,7 @@
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<spring-javaformat-checkstyle.version>0.0.43</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
<pitest-maven.version>1.16.1</pitest-maven.version>
<pitest-maven.version>1.16.3</pitest-maven.version>
<pitest-junit5-plugin.version>0.16</pitest-junit5-plugin.version>
<disable.checks>false</disable.checks>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
+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.0-M1</version>
<version>4.1.5</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.0-M1</version>
<version>3.2.12</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.0-M1</spring-boot.version>
<spring-boot.version>3.2.12</spring-boot.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
</properties>
<build>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.0-M1</version>
<version>4.1.5</version>
</parent>
<dependencies>
<dependency>
@@ -190,5 +190,21 @@
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="toLowerCaseWithoutLocale"/>
<property name="format" value="\.toLowerCase\(\)"/>
<property name="maximum" value="0"/>
<property name="message"
value="String.toLowerCase() should be String.toLowerCase(Locale.ROOT)"/>
<property name="ignoreComments" value="true"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="toUpperCaseWithoutLocale"/>
<property name="format" value="\.toUpperCase\(\)"/>
<property name="maximum" value="0"/>
<property name="message"
value="String.toUpperCase() should be String.toUpperCase(Locale.ROOT)"/>
<property name="ignoreComments" value="true"/>
</module>
</module>
</module>
+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.0-M1</version>
<version>4.1.5</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>