Compare commits

..
39 Commits
Author SHA1 Message Date
spring-builds 7b0e25f496 Update SNAPSHOT to 4.3.0-M2 2025-02-27 14:55:05 +00:00
Ryan Baxter b7b60f501d Merge pull request #419 from spring-cloud/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.14.0
Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0
2025-02-21 08:57:01 -05:00
Ryan Baxter 5e943a0c19 Merge pull request #417 from spring-cloud/dependabot/maven/main/org.apache.maven.plugins-maven-compiler-plugin-3.14.0
Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0
2025-02-21 08:56:08 -05:00
dependabot[bot] c4f7cc95ef Bump org.apache.maven.plugins:maven-compiler-plugin
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-21 09:43:58 +00:00
dependabot[bot] 2a39690e07 Bump org.apache.maven.plugins:maven-compiler-plugin
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-21 09:35:46 +00:00
spring-builds 4864371dae Bumping versions 2025-02-20 21:53:19 +00:00
Ryan Baxter b61f7fdc06 Merge pull request #411 from spring-cloud/dependabot/maven/main/commons-logging-commons-logging-1.3.5
Bump commons-logging:commons-logging from 1.3.4 to 1.3.5
2025-02-10 08:49:11 -05:00
Ryan Baxter f312b07b43 Merge pull request #413 from spring-cloud/dependabot/maven/commons-logging-commons-logging-1.3.5
Bump commons-logging:commons-logging from 1.3.4 to 1.3.5
2025-02-10 08:48:21 -05:00
dependabot[bot] 5e41be9a4c 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 10:11:14 +00:00
dependabot[bot] 78dd3edf84 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 10:09:20 +00:00
Olga Maciaszek-Sharma b474d4b7e6 Revert "Bump com.puppycrawl.tools:checkstyle from 9.3 to 10.21.2"
This reverts commit 4afcd4d4aa.
2025-02-07 13:46:25 +01:00
Ryan Baxter f61ef611fa Merge pull request #408 from spring-cloud/dependabot/maven/com.puppycrawl.tools-checkstyle-10.21.2
Bump com.puppycrawl.tools:checkstyle from 9.3 to 10.21.2
2025-02-06 09:51:42 -05:00
Ryan Baxter 7054f5ff50 Merge pull request #407 from spring-cloud/dependabot/maven/org.basepom.maven-duplicate-finder-maven-plugin-2.0.1
Bump org.basepom.maven:duplicate-finder-maven-plugin from 1.5.1 to 2.0.1
2025-02-06 09:50:54 -05:00
dependabot[bot] 4afcd4d4aa Bump com.puppycrawl.tools:checkstyle from 9.3 to 10.21.2
---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-06 10:05:08 +00:00
dependabot[bot] 894245c23a Bump org.basepom.maven:duplicate-finder-maven-plugin from 1.5.1 to 2.0.1
---
updated-dependencies:
- dependency-name: org.basepom.maven:duplicate-finder-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-06 10:03:45 +00:00
Ryan Baxter 0252056b88 Merge pull request #406 from spring-cloud/dependabot/maven/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:31:12 -05:00
Ryan Baxter de8683d8f3 Merge pull request #396 from spring-cloud/dependabot/maven/main/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:24:17 -05:00
dependabot[bot] 68caf4d247 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 14:16:31 +00:00
Ryan Baxter 6717ccd44d Ignore JRuby updates
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-05 09:15:20 -05:00
Ryan Baxter ff88b313db Update dependabot.yml
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-05 09:10:52 -05:00
Ryan Baxter 948ce73e57 Ignore JRuby updates
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-05 09:09:23 -05:00
dependabot[bot] 73b68369bd 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 09:15:18 +00:00
Ryan Baxter d46ea503d3 Revert JRuby upgrade 2025-02-04 11:16:01 -05:00
Ryan Baxter ec92da3602 Merge branch '4.2.x' 2025-02-04 10:57:17 -05:00
Ryan Baxter 9cbdae28e9 Merge pull request #394 from spring-cloud/dependabot/maven/main/org.jruby-jruby-complete-9.4.11.0
Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0
2025-02-03 10:40:22 -05:00
Ryan Baxter 51759bb7eb Merge pull request #390 from spring-cloud/dependabot/npm_and_yarn/docs/main/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:34:32 -05:00
dependabot[bot] 19ffe30a1c Bump org.jruby:jruby-complete from 9.4.9.0 to 9.4.11.0
Bumps org.jruby:jruby-complete from 9.4.9.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:33:29 +00:00
Ryan Baxter 9cab7d1471 Adding 4.2.x.branches
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:33:12 -05:00
Ryan Baxter b3b37ee5ba Adding 4.2.x branches
Signed-off-by: Ryan Baxter <ryan.baxter@broadcom.com>
2025-02-03 10:32:30 -05:00
dependabot[bot] 344a85014e 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:53:17 +00:00
spring-builds 4fc9d4d64d Going back to snapshots 2025-01-30 02:05:57 +00:00
spring-builds 8af370f967 Update SNAPSHOT to 4.3.0-M1 2025-01-30 02:05:23 +00:00
spring-builds b4153c8ee9 Bumping versions 2025-01-17 17:15:11 +00:00
spring-builds 8e0f3743a2 Bumping versions 2025-01-16 20:00:15 +00:00
spencergibb 58b3d24564 Updates version to 4.3.0-SNAPSHOT 2025-01-16 12:34:18 -05:00
spring-builds 99da7a4c3d Bumping versions 2025-01-16 16:30:15 +00:00
Ryan Baxter bbd8995be6 Merge branch '4.1.x' 2025-01-16 11:00:54 -05:00
Ryan Baxter 862fdea34a Merge branch 'main' of github.com:spring-cloud/spring-cloud-build 2025-01-16 10:47:59 -05:00
Ryan Baxter a17f916403 Merge branch '4.1.x' 2025-01-16 10:47:19 -05:00
9 changed files with 81 additions and 113 deletions
+34
View File
@@ -4,12 +4,30 @@
# 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
ignore:
# JRuby updates are causing docs generation to fail
- dependency-name: "org.jruby:jruby-complete"
- package-ecosystem: maven
directory: /
schedule:
@@ -31,6 +49,17 @@ updates:
update-types:
- version-update:semver-major
- version-update:semver-minor
- package-ecosystem: maven
directory: /
schedule:
interval: daily
target-branch: 4.2.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,6 +70,11 @@ 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
+4 -5
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-suppressions.xml
.projectRoot/src/checkstyle/checkstyle-suppresions.xml
----
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
@@ -162,11 +162,10 @@ 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:
[source,bash]
----
```bash
$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/.editorconfig -o .editorconfig
$ touch .springformat
----
```
[[ide-setup]]
== IDE setup
@@ -230,7 +229,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]
+2 -2
View File
@@ -4,7 +4,7 @@
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.1",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.4",
"@springio/asciidoctor-extensions": "1.0.0-alpha.17"
"@springio/antora-extensions": "1.14.2",
"@springio/asciidoctor-extensions": "1.0.0-alpha.16"
}
}
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.2</version>
<version>4.3.0-M2</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
+20 -71
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.2</version>
<version>4.3.0-M2</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.7</spring-boot.version>
<spring-cloud-build.version>4.2.2</spring-cloud-build.version>
<spring-boot.version>3.5.0-M2</spring-boot.version>
<spring-cloud-build.version>4.3.0-M2</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,32 +50,32 @@
<sonar.language>java</sonar.language>
<!-- Plugins -->
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.14.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.47</spring-javaformat.version>
<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.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.11.2</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>3.5.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.1</exec-maven-plugin.version>
<exec-maven-plugin.version>3.5.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.2.7</maven-gpg-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-dependency-plugin.version>3.8.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.47</spring-javaformat-checkstyle.version>
<spring-javaformat-checkstyle.version>0.0.43</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<pitest-junit5-plugin.version>0.16</pitest-junit5-plugin.version>
<disable.checks>false</disable.checks>
@@ -111,11 +111,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>3.1.3</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>1.5.1</duplicate-finder-maven-plugin.version>
<duplicate-finder-maven-plugin.version>2.0.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,7 +143,6 @@
<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,12 +699,7 @@
<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>
@@ -742,7 +736,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.4.0</version>
<version>3.6.0</version>
</plugin>
</plugins>
</reporting>
@@ -754,6 +748,11 @@
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,19 +848,6 @@
</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>
@@ -1310,7 +1296,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.13</version>
<version>0.8.12</version>
<configuration>
<destFile>${sonar.jacoco.reportPath}</destFile>
<append>true</append>
@@ -1377,43 +1363,6 @@
<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>
+10 -17
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.2</version>
<version>4.3.0-M2</version>
<name>spring-cloud-build-dependencies</name>
<packaging>pom</packaging>
<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,15 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.4.7</version>
<version>3.5.0-M2</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.7</spring-boot.version>
<spring-boot.version>3.5.0-M2</spring-boot.version>
<okhttp.version>4.12.0</okhttp.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>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -110,6 +109,12 @@
<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>
@@ -126,18 +131,6 @@
</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.2.2</version>
<version>4.3.0-M2</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)"/>
value="org\.junit\.(Assert|jupiter\.api\.Assertions)\.assert"/>
<property name="message"
value="Please use AssertJ imports."/>
<property name="ignoreComments" value="true"/>
+8 -15
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.2</version>
<version>4.3.0-M2</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>
@@ -70,7 +70,6 @@
</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>
@@ -110,6 +109,12 @@
<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>
@@ -149,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.7</version>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -159,18 +164,6 @@
</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>