Compare commits

..
65 Commits
Author SHA1 Message Date
spring-builds 1979e2ee40 Update SNAPSHOT to 5.0.0 2025-11-24 14:03:17 +00:00
Ryan Baxter 0de2658cff Merge pull request #577 from spring-cloud/dependabot/github_actions/main/actions/checkout-6 2025-11-24 07:47:09 -05:00
dependabot[bot] de07c3b748 Bump actions/checkout from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 09:20:05 +00:00
spencergibb 1ee571dbc1 Updates checkstyle version
Sets allowSamelineSingleParameterlessAnnotation = true
2025-11-21 10:36:55 -05:00
spencergibb 55662df3d3 Reverts checkstyle version update 2025-11-21 10:23:10 -05:00
spencergibb 8c25291dc4 Updates checkstyle version 2025-11-21 10:19:53 -05:00
spring-builds d9b94a7143 Bumping versions 2025-11-20 22:18:04 +00:00
Ryan Baxter 18b13263c2 Add annotation processor paths for Boot processors
This is needed to support JDK 23+, see https://inside.java/2024/06/18/quality-heads-up/
2025-11-18 16:40:40 -05:00
Ryan Baxter ff492e57cc Merge pull request #574 from spring-cloud/dependabot/maven/main/org.apache.maven.plugins-maven-jar-plugin-3.5.0
Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.2 to 3.5.0
2025-11-17 09:36:53 -05:00
dependabot[bot] bca32d84d8 Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.2 to 3.5.0
Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.4.2...maven-jar-plugin-3.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-17 09:01:27 +00:00
spring-builds 7233143db4 Bumping versions 2025-11-12 23:26:01 +00:00
spring-builds 05688d7e42 Going back to snapshots 2025-11-12 10:36:00 +00:00
spring-builds 94159e7b59 Update SNAPSHOT to 5.0.0-RC1 2025-11-12 10:35:25 +00:00
Ryan Baxter 3db590af9b Merge pull request #573 from spring-cloud/dependabot/maven/main/com.google.errorprone-error_prone_core-2.44.0 2025-11-10 05:17:59 -05:00
dependabot[bot] 966180f927 Bump com.google.errorprone:error_prone_core from 2.43.0 to 2.44.0
Bumps [com.google.errorprone:error_prone_core](https://github.com/google/error-prone) from 2.43.0 to 2.44.0.
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.43.0...v2.44.0)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_core
  dependency-version: 2.44.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-10 09:20:54 +00:00
spencergibb e70be04528 Aligns logging with boot logging starter 2025-11-06 19:15:35 -05:00
spring-builds 1096b27255 Bumping versions 2025-11-06 23:05:05 +00:00
spencergibb 2d676e78d3 Adds slf4j-api to docs
java.lang.NoClassDefFoundError: org/slf4j/LoggerFactory in contract docs
2025-11-06 16:28:11 -05:00
Ryan Baxter 6642a0109c Merge pull request #572 from spring-cloud/dependabot/maven/main/com.uber.nullaway-nullaway-0.12.12 2025-11-05 05:14:26 -05:00
dependabot[bot] 55db270458 Bump com.uber.nullaway:nullaway from 0.12.11 to 0.12.12
Bumps [com.uber.nullaway:nullaway](https://github.com/uber/NullAway) from 0.12.11 to 0.12.12.
- [Release notes](https://github.com/uber/NullAway/releases)
- [Changelog](https://github.com/uber/NullAway/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber/NullAway/compare/v0.12.11...v0.12.12)

---
updated-dependencies:
- dependency-name: com.uber.nullaway:nullaway
  dependency-version: 0.12.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-05 09:01:20 +00:00
Ryan Baxter be18f02d27 Merge pull request #571 from spring-cloud/dependabot/maven/main/com.uber.nullaway-nullaway-0.12.11 2025-11-03 05:17:53 -05:00
dependabot[bot] 32fcb4bfb5 Bump com.uber.nullaway:nullaway from 0.12.10 to 0.12.11
Bumps [com.uber.nullaway:nullaway](https://github.com/uber/NullAway) from 0.12.10 to 0.12.11.
- [Release notes](https://github.com/uber/NullAway/releases)
- [Changelog](https://github.com/uber/NullAway/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber/NullAway/compare/v0.12.10...v0.12.11)

---
updated-dependencies:
- dependency-name: com.uber.nullaway:nullaway
  dependency-version: 0.12.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-03 09:04:55 +00:00
Ryan Baxter 57dafbff67 Revert "Use Spring Boot 4.0.0-RC1"
This reverts commit f7f3e474ba.
2025-10-30 10:08:05 -04:00
spencergibb c5c70bf55d Updates kotlin-maven-plugin for version 2.2
See gh-570
2025-10-27 16:54:15 -04:00
spencergibb 65cf49b5cb Updates kotlin to 2.2.21
Fixes gh-570
2025-10-27 16:44:48 -04:00
spencergibb 8609973a11 Merge branch '4.3.x' 2025-10-27 16:42:18 -04:00
spencergibb 27b4de3246 Adds comment to kotlin-maven-plugin declaration 2025-10-27 13:24:11 -04:00
spencergibb c7c263b18a Manage kotlin-maven-plugin
See 								https://github.com/spring-projects/spring-framework/blob/6.2.x/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java#L38-L39

Fixes gh-570
2025-10-27 13:09:18 -04:00
spring-builds 36d7070617 Bumping versions 2025-10-27 17:02:40 +00:00
Ryan Baxter 848ce2317d Merge pull request #569 from spring-cloud/dependabot/maven/main/org.apache.maven.plugins-maven-war-plugin-3.5.0 2025-10-27 07:39:35 -04:00
dependabot[bot] 6b1db1e2d8 Bump org.apache.maven.plugins:maven-war-plugin from 3.4.0 to 3.5.0
Bumps [org.apache.maven.plugins:maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/apache/maven-war-plugin/releases)
- [Commits](https://github.com/apache/maven-war-plugin/compare/maven-war-plugin-3.4.0...maven-war-plugin-3.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 09:22:57 +00:00
spring-builds 3dea69b70f Bumping versions 2025-10-25 13:02:38 +00:00
Ryan Baxter f7f3e474ba Use Spring Boot 4.0.0-RC1 2025-10-24 13:23:46 -04:00
spencergibb 0de70a0634 Updates build to 4.3.2-SNAPSHOT 2025-10-24 09:29:41 -04:00
spring-builds e41acff7b3 Bumping versions 2025-10-24 02:51:51 +00:00
Ryan Baxter 9062fb2bb0 Merge pull request #568 from spring-cloud/dependabot/maven/main/com.google.errorprone-error_prone_core-2.43.0 2025-10-23 05:15:26 -04:00
dependabot[bot] bfbaddb446 Bump com.google.errorprone:error_prone_core from 2.42.0 to 2.43.0
Bumps [com.google.errorprone:error_prone_core](https://github.com/google/error-prone) from 2.42.0 to 2.43.0.
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.42.0...v2.43.0)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_core
  dependency-version: 2.43.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-23 09:04:57 +00:00
Ryan Baxter f5384dda9d Merge pull request #567 from spring-cloud/dependabot/maven/main/org.apache.maven.plugins-maven-antrun-plugin-3.2.0 2025-10-21 05:13:51 -04:00
dependabot[bot] 45d52c522c Bump org.apache.maven.plugins:maven-antrun-plugin from 3.1.0 to 3.2.0
Bumps [org.apache.maven.plugins:maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/apache/maven-antrun-plugin/releases)
- [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-3.1.0...maven-antrun-plugin-3.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-21 09:02:21 +00:00
Ryan Baxter 0a9eb2bd66 Moving to Spring Boot 4.0.0 snapshots 2025-10-20 14:31:20 -04:00
Ryan Baxter f20835b2e7 Merge pull request #566 from spring-cloud/dependabot/maven/main/org.codehaus.mojo-exec-maven-plugin-3.6.2
Bump org.codehaus.mojo:exec-maven-plugin from 3.6.1 to 3.6.2
2025-10-20 09:27:18 -04:00
dependabot[bot] 9ddc867969 Bump org.codehaus.mojo:exec-maven-plugin from 3.6.1 to 3.6.2
Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.6.1...3.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-20 09:24:52 +00:00
spring-builds d39422de45 Going back to snapshots 2025-10-17 10:52:06 +00:00
Ryan Baxter dc35ddb021 Merge pull request #565 from spring-cloud/dependabot/maven/4.3.x/org.jacoco-jacoco-maven-plugin-0.8.14 2025-10-13 05:59:11 -04:00
dependabot[bot] 03fac26d9d Bump org.jacoco:jacoco-maven-plugin from 0.8.13 to 0.8.14
Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.13 to 0.8.14.
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.13...v0.8.14)

---
updated-dependencies:
- dependency-name: org.jacoco:jacoco-maven-plugin
  dependency-version: 0.8.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-13 09:39:32 +00:00
Ryan Baxter c78628bd59 Merge pull request #560 from spring-cloud/dependabot/npm_and_yarn/docs/4.3.x/antora-3.2.0-alpha.10 2025-10-06 06:39:08 -04:00
dependabot[bot] fda3dad29f Bump antora from 3.2.0-alpha.9 to 3.2.0-alpha.10 in /docs
Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.9 to 3.2.0-alpha.10.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.9...v3.2.0-alpha.10)

---
updated-dependencies:
- dependency-name: antora
  dependency-version: 3.2.0-alpha.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-06 09:37:55 +00:00
spring-builds c0393d983b Bumping versions 2025-09-27 13:06:17 +00:00
Ryan Baxter 0128f838fc Merge pull request #550 from spring-cloud/dependabot/maven/4.3.x/org.apache.maven.plugins-maven-compiler-plugin-3.14.1
Bump org.apache.maven.plugins:maven-compiler-plugin from 3.14.0 to 3.14.1
2025-09-22 09:21:17 -04:00
dependabot[bot] c218e9e4ce 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.14.0 to 3.14.1.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.14.0...maven-compiler-plugin-3.14.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-22 10:11:08 +00:00
Ryan Baxter 5df9e1ff33 Merge pull request #544 from spring-cloud/dependabot/maven/4.3.x/org.springframework.boot-spring-boot-dependencies-3.5.7-SNAPSHOT 2025-09-19 06:22:12 -04:00
dependabot[bot] f173900e0c Bump org.springframework.boot:spring-boot-dependencies
Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.5.6-SNAPSHOT to 3.5.7-SNAPSHOT.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/commits)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-version: 3.5.7-SNAPSHOT
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-19 09:22:10 +00:00
Ryan Baxter 0cecad1170 Merge pull request #536 from spring-cloud/dependabot/npm_and_yarn/docs/4.3.x/antora/atlas-extension-1.0.0-alpha.5
Bump @antora/atlas-extension from 1.0.0-alpha.2 to 1.0.0-alpha.5 in /docs
2025-09-15 10:39:01 -04:00
Ryan Baxter 13065bca56 Merge pull request #538 from spring-cloud/dependabot/maven/4.3.x/org.apache.maven.plugins-maven-failsafe-plugin-3.5.4
Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.3 to 3.5.4
2025-09-15 10:38:03 -04:00
Ryan Baxter 49bf26669e Merge pull request #539 from spring-cloud/dependabot/maven/4.3.x/org.apache.maven.plugins-maven-shade-plugin-3.6.1
Bump org.apache.maven.plugins:maven-shade-plugin from 3.6.0 to 3.6.1
2025-09-15 10:37:33 -04:00
Ryan Baxter 8effa1e5e5 Merge pull request #540 from spring-cloud/dependabot/maven/4.3.x/org.apache.maven.plugins-maven-surefire-plugin-3.5.4
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.3 to 3.5.4
2025-09-15 10:37:09 -04:00
dependabot[bot] a0667a6379 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.3 to 3.5.4
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.3 to 3.5.4.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.3...surefire-3.5.4)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-version: 3.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-15 10:19:54 +00:00
dependabot[bot] 32dfb6bb1f Bump org.apache.maven.plugins:maven-shade-plugin from 3.6.0 to 3.6.1
Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.6.0...v3.6.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-version: 3.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-15 10:15:20 +00:00
dependabot[bot] d3239836da Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.3 to 3.5.4
Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.3 to 3.5.4.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.3...surefire-3.5.4)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-version: 3.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-15 10:14:15 +00:00
dependabot[bot] 242a75d1aa Bump @antora/atlas-extension in /docs
---
updated-dependencies:
- dependency-name: "@antora/atlas-extension"
  dependency-version: 1.0.0-alpha.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-15 10:09:45 +00:00
spring-builds 1013424ebc Bumping versions 2025-09-09 13:02:21 +00:00
spring-builds 47f1fc2a81 Bumping dependency versions after release 2025-09-08 20:40:25 +00:00
spring-builds 15c8e319fc Bumping versions to 4.3.2-SNAPSHOT after release 2025-09-08 20:39:34 +00:00
spring-builds d6b054cce0 Going back to snapshots 2025-09-08 20:39:33 +00:00
spring-builds 600f5bfc72 Update SNAPSHOT to 4.3.1 2025-09-08 20:39:00 +00:00
8 changed files with 91 additions and 26 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
# if: github.repository_owner == 'spring-projects'
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
ref: docs-build
fetch-depth: 1
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Set up JDK
uses: actions/setup-java@v5
with:
+13 -7
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>5.0.0-M4</version>
<version>5.0.0</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
@@ -29,17 +29,23 @@
</properties>
<dependencies>
<!-- Script -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+69 -10
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>5.0.0-M4</version>
<version>5.0.0</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,9 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>4.0.0-M3</spring-boot.version>
<spring-cloud-build.version>5.0.0-M4</spring-cloud-build.version>
<spring-boot.version>4.0.0</spring-boot.version>
<spring-cloud-build.version>5.0.0</spring-cloud-build.version>
<kotlin.version>2.2.21</kotlin.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>
@@ -41,8 +42,8 @@
<revision>${project.version}</revision>
<asciidoctorj.version>2.5.13</asciidoctorj.version>
<jruby-complete.version>9.4.9.0</jruby-complete.version>
<error-prone.version>2.42.0</error-prone.version>
<nullaway.version>0.12.10</nullaway.version>
<error-prone.version>2.44.0</error-prone.version>
<nullaway.version>0.12.12</nullaway.version>
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -56,17 +57,17 @@
<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>
<puppycrawl-tools-checkstyle.version>12.1.2</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.47</spring-javaformat.version>
<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.12.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-jar-plugin.version>3.5.0</maven-jar-plugin.version>
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
<maven-surefire-plugin.version>3.5.4</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.6.1</exec-maven-plugin.version>
<maven-war-plugin.version>3.5.0</maven-war-plugin.version>
<exec-maven-plugin.version>3.6.2</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.1</maven-shade-plugin.version>
@@ -299,6 +300,46 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<!-- Based on instructions here - https://kotlinlang.org/docs/reference/using-maven.html -->
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<configuration>
<!--https://github.com/spring-projects/spring-framework/blob/main/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java#L47-L58 -->
<apiVersion>2.2</apiVersion>
<languageVersion>2.2</languageVersion>
<jvmTarget>17</jvmTarget>
<javaParameters>true</javaParameters>
<args>-Xjsr305=strict -opt-in=kotlin.RequiresOptIn -Xjdk-release=17 -Xannotation-default-target=param-property</args>
</configuration>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
@@ -338,6 +379,16 @@
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<compilerArgument>-parameters</compilerArgument>
<annotationProcessorPaths>
<path>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</path>
<path>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
@@ -984,6 +1035,14 @@
<artifactId>nullaway</artifactId>
<version>${nullaway.version}</version>
</path>
<path>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</path>
<path>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
+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>5.0.0-M4</version>
<version>5.0.0</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>4.0.0-M3</version>
<version>4.0.0</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>4.0.0-M3</spring-boot.version>
<spring-boot.version>4.0.0</spring-boot.version>
<okhttp.version>4.12.0</okhttp.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>5.0.0-M4</version>
<version>5.0.0</version>
</parent>
<dependencies>
<dependency>
@@ -49,7 +49,7 @@
<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck">
<property name="allowSamelineSingleParameterlessAnnotation"
value="false"/>
value="true"/>
</module>
<!-- Block Checks -->
@@ -121,7 +121,7 @@
<property name="authorFormat" value=".+\s.+"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
<property name="scope" value="public"/>
<property name="accessModifiers" value="public"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
+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>5.0.0-M4</version>
<version>5.0.0</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>