Compare commits

..
29 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
11 changed files with 121 additions and 121 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ given the ability to merge pull requests.
## Code of Conduct
This project adheres to the Contributor Covenant [code of
conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report
conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report
unacceptable behavior to spring-code-of-conduct@pivotal.io.
## Code Conventions and Housekeeping
-54
View File
@@ -4,66 +4,22 @@
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "main"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "4.2.x"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "4.1.x"
schedule:
interval: "weekly"
- package-ecosystem: maven
directory: /
schedule:
interval: daily
target-branch: main
ignore:
# IDE specific dependency
- dependency-name: "org.eclipse.m2e:lifecycle-mapping"
# JRuby updates are causing docs generation to fail
- dependency-name: "org.jruby:jruby-complete"
# only upgrade by minor or patch
- dependency-name: "*"
update-types:
- version-update:semver-major
- package-ecosystem: maven
directory: /
schedule:
interval: daily
target-branch: 4.1.x
ignore:
# IDE specific dependency
- dependency-name: "org.eclipse.m2e:lifecycle-mapping"
# JRuby updates are causing docs generation to fail
- dependency-name: "org.jruby:jruby-complete"
- dependency-name: "*"
update-types:
- version-update:semver-major
- version-update:semver-minor
- package-ecosystem: maven
directory: /
schedule:
interval: daily
target-branch: 4.2.x
ignore:
# IDE specific dependency
- dependency-name: "org.eclipse.m2e:lifecycle-mapping"
# JRuby updates are causing docs generation to fail
- dependency-name: "org.jruby:jruby-complete"
# 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: /
@@ -74,13 +30,3 @@ updates:
directory: /docs
schedule:
interval: weekly
- package-ecosystem: npm
target-branch: 4.2.x
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.2.x, 4.1.x, 3.1.x ]
branches: [ main, 4.1.x, 3.1.x ]
pull_request:
branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
branches: [ main, 4.1.x, 3.1.x ]
jobs:
build:
+4 -3
View File
@@ -148,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
@@ -162,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
+3 -3
View File
@@ -14,9 +14,9 @@ For additional details, please refer to the blog post https://spring.io/blog/202
[[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
@@ -190,7 +190,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 project'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 projecst's `pom.xml`.
.pom.xml
[source,xml]
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.3.0-RC1</version>
<version>4.1.6</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+76 -24
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.3.0-RC1</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.5.0-RC1</spring-boot.version>
<spring-cloud-build.version>4.3.0-RC1</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>
@@ -50,33 +50,34 @@
<sonar.language>java</sonar.language>
<!-- Plugins -->
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<!-- 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>
<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.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>
<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.3</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-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.5.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>
<license-maven-plugin.version>2.4.0</license-maven-plugin.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>
<disable.checks>false</disable.checks>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
@@ -111,11 +112,11 @@
<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.4</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>
<duplicate-finder-maven-plugin.version>2.0.1</duplicate-finder-maven-plugin.version>
<duplicate-finder-maven-plugin.version>1.5.1</duplicate-finder-maven-plugin.version>
<duplicate-finder-maven-plugin.printEqualFiles>false</duplicate-finder-maven-plugin.printEqualFiles>
<duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>
<duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>
@@ -143,6 +144,7 @@
<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>
@@ -299,7 +301,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.7.0</version>
<version>1.6.0</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -699,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>
@@ -736,7 +743,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>
@@ -748,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>
@@ -848,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>
@@ -1363,6 +1378,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>
+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 -23
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>4.3.0-RC1</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,27 +14,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.5.0-RC1</version>
<version>3.3.13</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.5.0-RC1</spring-boot.version>
<okhttp.version>4.12.0</okhttp.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>
<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>
@@ -109,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>
@@ -131,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.3.0-RC1</version>
<version>4.1.6</version>
</parent>
<dependencies>
<dependency>
+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.3.0-RC1</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>