Merge branch '4.1.x' of github.com:spring-cloud/spring-cloud-build into 4.1.x

This commit is contained in:
Ryan Baxter
2025-06-20 16:19:54 -04:00
3 changed files with 7 additions and 6 deletions
+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
+1 -1
View File
@@ -28,7 +28,7 @@
<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-boot.version>3.3.13</spring-boot.version>
<spring-cloud-build.version>4.1.6-SNAPSHOT</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>
+2 -2
View File
@@ -14,12 +14,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.2.12</version>
<version>3.3.13</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.3.13</spring-boot.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
</properties>
<build>