Compare commits

..
15 Commits
Author SHA1 Message Date
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
9 changed files with 61 additions and 52 deletions
-16
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: /
@@ -41,8 +30,3 @@ updates:
directory: /docs
schedule:
interval: weekly
- package-ecosystem: npm
target-branch: 4.1.x
directory: /docs
schedule:
interval: weekly
+2 -2
View File
@@ -5,9 +5,9 @@ name: Build
on:
push:
branches: [ main, 4.1.x, 3.1.x ]
branches: [ main, 3.1.x ]
pull_request:
branches: [ main, 4.1.x, 3.1.x ]
branches: [ main, 3.1.x ]
jobs:
build:
+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
+1 -1
View File
@@ -2,7 +2,7 @@
"dependencies": {
"antora": "3.2.0-alpha.6",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.0-beta.4",
"@antora/collector-extension": "1.0.0-rc.1",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.2",
"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.0-RC1</version>
<version>4.1.4</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+50 -12
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-RC1</version>
<version>4.1.4</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-RC1</spring-boot.version>
<spring-cloud-build.version>4.2.0-RC1</spring-cloud-build.version>
<spring-boot.version>3.2.12</spring-boot.version>
<spring-cloud-build.version>4.1.4</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.9.0</jruby-complete.version>
<jruby-complete.version>9.4.8.0</jruby-complete.version>
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -56,27 +56,28 @@
<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>
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.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>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<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.5.0</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>
<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-dependency-plugin.version>3.8.1</maven-dependency-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>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.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>
<disable.checks>false</disable.checks>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
@@ -111,7 +112,7 @@
<javadoc.failOnError>false</javadoc.failOnError>
<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
<maven-deploy-plugin-default.phase>deploy</maven-deploy-plugin-default.phase>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<readme.main.classpath>${docs.classes.dir}</readme.main.classpath>
<readme.class.path>readme.class.path</readme.class.path>
<sonar-jacoco-listeners.version>5.14.0.18788</sonar-jacoco-listeners.version>
@@ -736,7 +737,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.6.0</version>
<version>3.4.0</version>
</plugin>
</plugins>
</reporting>
@@ -1363,6 +1364,43 @@
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>
<profile>
<id>mutation</id>
<build>
<plugins>
<plugin>
<groupId>org.pitest</groupId>
<artifactId>pitest-maven</artifactId>
<version>${pitest-maven.version}</version>
<configuration>
<!-- generate line coverage -->
<exportLineCoverage>true</exportLineCoverage>
<!-- in the "right" format -->
<outputFormats><value>XML</value></outputFormats>
<!-- and write reports where report-aggregate-module expects to find it -->
<timestampedReports>false</timestampedReports>
<!-- There are modules that don't have tests -->
<failWhenNoMutations>false</failWhenNoMutations>
</configuration>
<executions>
<execution>
<id>mutationCoverage</id>
<goals>
<goal>mutationCoverage</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.pitest</groupId>
<artifactId>pitest-junit5-plugin</artifactId>
<version>${pitest-junit5-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>CI</id>
<activation>
+3 -16
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-RC1</version>
<version>4.1.4</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,27 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.4.0-RC1</version>
<version>3.2.12</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.0-RC1</spring-boot.version>
<okhttp.version>4.12.0</okhttp.version>
<spring-boot.version>3.2.12</spring-boot.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- removed from spring-boot-dependencies in 3.4.0 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-bom</artifactId>
<version>${okhttp.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.0-RC1</version>
<version>4.1.4</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.0-RC1</version>
<version>4.1.4</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>