Compare commits

..
23 Commits
Author SHA1 Message Date
buildmaster ffa00fb2c2 Update SNAPSHOT to 4.2.0-M1 2024-08-19 15:13:06 +00:00
buildmaster 54449fca84 Going back to snapshots 2024-08-19 14:29:21 +00:00
buildmaster c0ae6afd28 Update SNAPSHOT to 4.2.0-M1 2024-08-19 14:28:49 +00:00
buildmaster 772753e798 Going back to snapshots 2024-08-19 12:14:12 +00:00
buildmaster 53cdd26085 Update SNAPSHOT to 4.2.0-M1 2024-08-19 12:13:40 +00:00
Ryan Baxter af5f8dbaf9 Merge pull request #309 from spring-cloud/dependabot/npm_and_yarn/docs/main/antora/collector-extension-1.0.0-beta.2 2024-08-19 06:38:02 -04:00
Ryan Baxter dad0be9f4c Merge pull request #310 from spring-cloud/dependabot/npm_and_yarn/docs/main/springio/antora-extensions-1.14.2 2024-08-19 06:37:27 -04:00
dependabot[bot] 587df041a9 Bump @springio/antora-extensions from 1.13.1 to 1.14.2 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.13.1 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.1...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-19 10:01:53 +00:00
dependabot[bot] 27edd1d57a 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-08-19 10:01:46 +00:00
Ryan Baxter 432402c180 Merge pull request #306 from spring-cloud/dependabot/maven/main/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:04:47 -04:00
Ryan Baxter 9ee97497bb Merge pull request #305 from spring-cloud/dependabot/maven/main/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:04:07 -04:00
dependabot[bot] 8d755c1f84 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:46:05 +00:00
dependabot[bot] 889f8a14fb 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:46:01 +00:00
Ryan Baxter e8b62d03da Merge pull request #302 from spring-cloud/dependabot/maven/main/org.codehaus.mojo-exec-maven-plugin-3.4.1
Bump org.codehaus.mojo:exec-maven-plugin from 3.4.0 to 3.4.1
2024-08-13 08:07:04 -04:00
dependabot[bot] c9683d2a58 Bump org.codehaus.mojo:exec-maven-plugin from 3.4.0 to 3.4.1
Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:exec-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-13 09:23:49 +00:00
Ryan Baxter f924a82305 Merge pull request #300 from spring-cloud/dependabot/npm_and_yarn/docs/main/antora/collector-extension-1.0.0-beta.1
Bump @antora/collector-extension from 1.0.0-alpha.7 to 1.0.0-beta.1 in /docs
2024-08-12 07:52:41 -04:00
Ryan Baxter 55b0c163cf Merge pull request #301 from spring-cloud/dependabot/npm_and_yarn/docs/main/springio/antora-extensions-1.13.1
Bump @springio/antora-extensions from 1.13.0 to 1.13.1 in /docs
2024-08-12 07:52:05 -04:00
dependabot[bot] a669edd35f Bump @springio/antora-extensions from 1.13.0 to 1.13.1 in /docs
Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.13.0 to 1.13.1.
- [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.13.1)

---
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>
2024-08-12 09:36:48 +00:00
dependabot[bot] 8f6b0d0635 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-08-12 09:36:42 +00:00
Ryan Baxter cb1d0341be Update dependabot.yml 2024-08-07 09:28:41 -04:00
Ryan Baxter 43f23e0357 Merge pull request #297 from spring-cloud/dependabot/maven/main/org.codehaus.mojo-exec-maven-plugin-3.4.0
Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.0
2024-08-07 09:23:36 -04:00
dependabot[bot] c01fe66c73 Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.0
Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.3.0...3.4.0)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:exec-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-07 09:21:56 +00:00
Ryan Baxter 7fdbcd0e4e Updating versions for next release 2024-08-05 10:23:01 -04:00
9 changed files with 28 additions and 33 deletions
+11
View File
@@ -20,6 +20,17 @@ 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/modules/ROOT/partials/code-of-conduct.adoc[code of
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
conduct]. By participating, you are expected to uphold this code. Please report
unacceptable behavior to code-of-conduct@spring.io.
unacceptable behavior to spring-code-of-conduct@pivotal.io.
[[code-conventions-and-housekeeping]]
== Code Conventions and Housekeeping
+3 -3
View File
@@ -1,10 +1,10 @@
{
"dependencies": {
"antora": "3.2.0-alpha.8",
"antora": "3.2.0-alpha.6",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.1",
"@antora/collector-extension": "1.0.0-beta.2",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.2",
"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
"@springio/asciidoctor-extensions": "1.0.0-alpha.12"
}
}
+2 -2
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.5</version>
<version>4.2.0-M1</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.3</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.1.5</version>
<version>4.2.0-M1</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.12</spring-boot.version>
<spring-cloud-build.version>4.1.5</spring-cloud-build.version>
<spring-boot.version>3.4.0-M1</spring-boot.version>
<spring-cloud-build.version>4.2.0-M1</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.3.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.4.1</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.3</pitest-maven.version>
<pitest-maven.version>1.16.1</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.1.5</version>
<version>4.2.0-M1</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.2.12</version>
<version>3.4.0-M1</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.2.12</spring-boot.version>
<spring-boot.version>3.4.0-M1</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.1.5</version>
<version>4.2.0-M1</version>
</parent>
<dependencies>
<dependency>
@@ -190,21 +190,5 @@
<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.1.5</version>
<version>4.2.0-M1</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>