mirror of
https://github.com/spring-cloud/spring-cloud-build.git
synced 2026-09-17 21:09:00 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d614a4ffe | ||
|
|
fbb97daee5 | ||
|
|
e806e677a3 | ||
|
|
56c12f8fdb | ||
|
|
e4e3763b8f | ||
|
|
77b332710b | ||
|
|
c7d4922635 | ||
|
|
986377cdf8 | ||
|
|
92329f3736 | ||
|
|
a4fec9472e | ||
|
|
76f3428c49 | ||
|
|
15a2ddac7a | ||
|
|
76f2ed2189 | ||
|
|
59eb16e44d | ||
|
|
d9c57e9939 | ||
|
|
ea6bcdee6f | ||
|
|
f3a5430644 | ||
|
|
877150f3bd | ||
|
|
55f6577d3f | ||
|
|
933d91cc46 | ||
|
|
59e9dfd16c | ||
|
|
c7a1050b28 | ||
|
|
cd4830261c | ||
|
|
90e2a1e253 | ||
|
|
596c525199 | ||
|
|
c994a98ca3 | ||
|
|
a04b703fef | ||
|
|
610b5a9514 | ||
|
|
eb8ad90685 | ||
|
|
248b182fbe | ||
|
|
fd736ff9fe | ||
|
|
7ef02593b8 | ||
|
|
0eb87b64cc | ||
|
|
dbbf09a54b | ||
|
|
8ddf0ebdbe | ||
|
|
20c3a9779d | ||
|
|
5feb64d891 | ||
|
|
eb3efc753d | ||
|
|
e420a723d3 | ||
|
|
8573178a13 | ||
|
|
3d0e104f62 | ||
|
|
09f48961a2 | ||
|
|
deb6afb3d4 | ||
|
|
e1646a8c8c | ||
|
|
005086996f | ||
|
|
01dbc3de5f | ||
|
|
901d5d9f57 | ||
|
|
165c2653a8 | ||
|
|
616a59b0e1 | ||
|
|
ce8354139f | ||
|
|
9417440474 | ||
|
|
a09b7a77f8 | ||
|
|
b2ed3a2d33 | ||
|
|
fdf4ee03dd | ||
|
|
015324d20b | ||
|
|
040160a7f1 | ||
|
|
b7705671f3 | ||
|
|
c213290982 | ||
|
|
5456a034b2 | ||
|
|
8b94c5f7e7 | ||
|
|
d21087a5ea | ||
|
|
584d5a0ff3 | ||
|
|
b91b1089c1 | ||
|
|
f4d4e2cd09 | ||
|
|
afa09907cd | ||
|
|
bbd3219ac6 | ||
|
|
b53e0d79bf | ||
|
|
3ee1c4194b | ||
|
|
32c2672454 | ||
|
|
0694626359 | ||
|
|
98a1225c33 | ||
|
|
71cd63d5f0 | ||
|
|
fbaf9cb7c6 | ||
|
|
769be1d42b | ||
|
|
3b15d1b103 | ||
|
|
e528f25ef6 | ||
|
|
9dd4589b17 | ||
|
|
aedd746d51 | ||
|
|
a58ac7b78a | ||
|
|
b0724a3a44 | ||
|
|
4ce3d223dc | ||
|
|
2625e86f0d | ||
|
|
71b0829593 | ||
|
|
55d0093b7a | ||
|
|
0020c8118c | ||
|
|
372432db59 | ||
|
|
48b494b73f | ||
|
|
a5dd59f51e |
+9
-11
@@ -13,12 +13,12 @@ updates:
|
||||
interval: "weekly"
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
target-branch: "4.3.x"
|
||||
target-branch: "4.2.x"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
target-branch: "4.2.x"
|
||||
target-branch: "4.1.x"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
- package-ecosystem: maven
|
||||
@@ -35,18 +35,16 @@ updates:
|
||||
- dependency-name: "*"
|
||||
update-types:
|
||||
- version-update:semver-major
|
||||
- version-update:semver-minor
|
||||
- package-ecosystem: maven
|
||||
directory: /
|
||||
schedule:
|
||||
interval: daily
|
||||
target-branch: 4.3.x
|
||||
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"
|
||||
# only upgrade by minor or patch
|
||||
- dependency-name: "*"
|
||||
update-types:
|
||||
- version-update:semver-major
|
||||
@@ -60,7 +58,7 @@ updates:
|
||||
# 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: "org.jruby:jruby-complete"
|
||||
# only upgrade by minor or patch
|
||||
- dependency-name: "*"
|
||||
update-types:
|
||||
@@ -76,13 +74,13 @@ updates:
|
||||
directory: /docs
|
||||
schedule:
|
||||
interval: weekly
|
||||
- package-ecosystem: npm
|
||||
target-branch: 4.3.x
|
||||
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
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
name: Spring Cloud Build Deploy
|
||||
name: Spring Cloud Build CI Job
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- 4.3.x
|
||||
- 4.2.x
|
||||
|
||||
# Scheduled builds run daily at midnight UTC
|
||||
schedule:
|
||||
@@ -16,7 +17,7 @@ on:
|
||||
branches:
|
||||
description: "Which branch should be built (can be a comma-separated list of branches)"
|
||||
required: true
|
||||
default: 'main'
|
||||
default: '4.3.x'
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
@@ -1,32 +0,0 @@
|
||||
# This workflow will build a Java project with Maven
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
|
||||
|
||||
name: Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main, 4.3.x, 4.2.x]
|
||||
pull_request:
|
||||
branches: [ main, 4.3.x, 4.2.x]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: 17
|
||||
distribution: 'temurin'
|
||||
- name: Cache local Maven repository
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
- name: Build with Maven
|
||||
run: ./mvnw clean install -Pdocs -B -U -Pspring
|
||||
@@ -0,0 +1,9 @@
|
||||
name: PR
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ 4.3.x ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@main
|
||||
+1
-11
@@ -1,11 +1 @@
|
||||
-Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
|
||||
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
|
||||
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
|
||||
-Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
|
||||
@@ -26,7 +26,7 @@ build succeed, please raise a ticket to get the settings added to
|
||||
source control.
|
||||
|
||||
The projects that require middleware (i.e. Redis) for testing generally
|
||||
require that a local instance of https://www.docker.com/get-started[Docker] is installed and running.
|
||||
require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
|
||||
|
||||
[[documentation]]
|
||||
== Documentation
|
||||
@@ -42,10 +42,17 @@ parsing or rendering it, just copying it to `${main.basedir}`
|
||||
any changes in the README it will then show up after a Maven build as
|
||||
a modified file in the correct place. Just commit it and push the change.
|
||||
|
||||
You can generate the docs site using the following command:
|
||||
|
||||
[indent=0]
|
||||
----
|
||||
./mvnw -pl docs -P docs antora:antora
|
||||
----
|
||||
|
||||
[[working-with-the-code]]
|
||||
== Working with the code
|
||||
If you don't have an IDE preference we would recommend that you use
|
||||
https://spring.io/tools[Spring Tools Suite] or
|
||||
https://www.springsource.com/developer/sts[Spring Tools Suite] or
|
||||
https://eclipse.org[Eclipse] when working with the code. We use the
|
||||
https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
|
||||
should also work without issue as long as they use Maven 3.3.3 or better.
|
||||
|
||||
@@ -109,7 +109,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
|
||||
@@ -123,11 +123,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
|
||||
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"antora": "3.2.0-alpha.11",
|
||||
"antora": "3.2.0-alpha.12",
|
||||
"@antora/atlas-extension": "1.0.0-alpha.5",
|
||||
"@antora/collector-extension": "1.0.2",
|
||||
"@antora/collector-extension": "1.0.3",
|
||||
"@asciidoctor/tabs": "1.0.0-beta.6",
|
||||
"@springio/antora-extensions": "1.14.7",
|
||||
"@springio/asciidoctor-extensions": "1.0.0-alpha.17"
|
||||
"@springio/antora-extensions": "1.14.12",
|
||||
"@springio/asciidoctor-extensions": "1.0.0-alpha.18"
|
||||
}
|
||||
}
|
||||
|
||||
+7
-13
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-build</artifactId>
|
||||
<version>5.0.1</version>
|
||||
<version>4.3.4</version>
|
||||
</parent>
|
||||
<properties>
|
||||
<docs.main>spring-cloud-build</docs.main>
|
||||
@@ -30,21 +30,15 @@
|
||||
<dependencies>
|
||||
<!-- Script -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-core</artifactId>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.3.5</version>
|
||||
<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>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-core</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-build</artifactId>
|
||||
<version>5.0.1</version>
|
||||
<version>4.3.4</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Spring Cloud Parent</name>
|
||||
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
|
||||
@@ -28,9 +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.2</spring-boot.version>
|
||||
<spring-cloud-build.version>5.0.1</spring-cloud-build.version>
|
||||
<kotlin.version>2.2.21</kotlin.version>
|
||||
<spring-boot.version>3.5.15</spring-boot.version>
|
||||
<spring-cloud-build.version>4.3.4</spring-cloud-build.version>
|
||||
<kotlin.version>1.9.25</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>
|
||||
@@ -42,8 +42,6 @@
|
||||
<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.45.0</error-prone.version>
|
||||
<nullaway.version>0.12.15</nullaway.version>
|
||||
|
||||
<!-- Sonar -->
|
||||
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
|
||||
@@ -57,27 +55,27 @@
|
||||
<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>12.1.2</puppycrawl-tools-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.4</maven-failsafe-plugin.version>
|
||||
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
|
||||
<maven-javadoc-plugin.version>3.11.3</maven-javadoc-plugin.version>
|
||||
<maven-source-plugin.version>3.3.1</maven-source-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-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.4</maven-surefire-plugin.version>
|
||||
<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
|
||||
<maven-war-plugin.version>3.5.1</maven-war-plugin.version>
|
||||
<exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
|
||||
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
|
||||
<exec-maven-plugin.version>3.5.1</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>
|
||||
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
|
||||
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
|
||||
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
|
||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-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.7.1</license-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>
|
||||
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
|
||||
<pitest-junit5-plugin.version>0.16</pitest-junit5-plugin.version>
|
||||
@@ -102,7 +100,7 @@
|
||||
<nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
|
||||
<disable.nohttp.checks>true</disable.nohttp.checks>
|
||||
<antelopetasks.version>3.2.10</antelopetasks.version>
|
||||
<ant.version>1.10.15</ant.version>
|
||||
<ant-nodeps.version>1.8.1</ant-nodeps.version>
|
||||
<configprops.path>${project.basedir}/modules/ROOT/partials/_configprops.adoc</configprops.path>
|
||||
<configprops.inclusionPattern>.*</configprops.inclusionPattern>
|
||||
<maven-dependency-plugin-for-docs.phase>generate-resources</maven-dependency-plugin-for-docs.phase>
|
||||
@@ -142,11 +140,12 @@
|
||||
<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
|
||||
<antora-maven-plugin.version>0.0.4</antora-maven-plugin.version>
|
||||
<org-antora-maven-plugin.version>1.0.0-alpha.5</org-antora-maven-plugin.version>
|
||||
<node.version>v16.20.2</node.version>
|
||||
<node.version>v22.22.0</node.version>
|
||||
<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.9.0</central-publishing-maven-plugin.version>
|
||||
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
|
||||
<node-download-url>https://nodejs.org/dist</node-download-url>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
@@ -306,12 +305,12 @@
|
||||
<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>
|
||||
<!-- https://github.com/spring-projects/spring-framework/blob/6.2.x/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java#L38-L39 -->
|
||||
<apiVersion>1.7</apiVersion>
|
||||
<languageVersion>1.7</languageVersion>
|
||||
<jvmTarget>17</jvmTarget>
|
||||
<javaParameters>true</javaParameters>
|
||||
<args>-Xjsr305=strict -opt-in=kotlin.RequiresOptIn -Xjdk-release=17 -Xannotation-default-target=param-property</args>
|
||||
<args>-Xjsr305=strict -opt-in=kotlin.RequiresOptIn</args>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -379,16 +378,6 @@
|
||||
<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>
|
||||
@@ -795,7 +784,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>
|
||||
@@ -875,6 +864,16 @@
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>milestone</id>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>repo.spring.io</id>
|
||||
<name>Spring Milestone Repository</name>
|
||||
<url>https://repo.spring.io/libs-milestone-local</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>central</id>
|
||||
<build>
|
||||
@@ -904,7 +903,6 @@
|
||||
<artifactId>central-publishing-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<publishingServerId>central</publishingServerId>
|
||||
<deploymentName>${project.artifactId}-${project.version}</deploymentName>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
@@ -970,84 +968,36 @@
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>java17</id>
|
||||
<id>java8</id>
|
||||
<activation>
|
||||
<jdk>[17,)</jdk>
|
||||
<jdk>[1.8,)</jdk>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<configuration>
|
||||
<doclint>none</doclint>
|
||||
<additionalparam>-Xdoclint:none</additionalparam>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>jspecify</id>
|
||||
<id>java11</id>
|
||||
<activation>
|
||||
<jdk>[25,)</jdk>
|
||||
<property>
|
||||
<name>jspecify.enabled</name>
|
||||
<value>true</value>
|
||||
</property>
|
||||
<jdk>[1.11,)</jdk>
|
||||
</activation>
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>${maven-compiler-plugin.version}</version>
|
||||
<configuration>
|
||||
<source>${maven.compiler.source}</source>
|
||||
<target>${maven.compiler.target}</target>
|
||||
<release>${java.version}</release>
|
||||
<compilerArgs>
|
||||
<compilerArg>-parameters</compilerArg>
|
||||
<!-- https://errorprone.info/docs/installation#maven -->
|
||||
<compilerArg>-XDcompilePolicy=simple</compilerArg>
|
||||
<compilerArg>--should-stop=ifError=FLOW</compilerArg>
|
||||
<compilerArg>
|
||||
-Xplugin:ErrorProne
|
||||
<!-- JSpecify mode https://github.com/uber/NullAway/wiki/JSpecify-Support -->
|
||||
-XepOpt:NullAway:JSpecifyMode=true
|
||||
<!-- Check JSpecify annotations -->
|
||||
-Xep:NullAway:ERROR
|
||||
-XepOpt:NullAway:OnlyNullMarked
|
||||
<!-- FIXME Remove once https://github.com/uber/NullAway/pull/1295 is released -->
|
||||
-XepOpt:NullAway:CustomContractAnnotations=org.springframework.lang.Contract
|
||||
-XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue
|
||||
<!-- https://github.com/uber/NullAway/issues/162 -->
|
||||
-XepExcludedPaths:.*/src/test/java/.*
|
||||
</compilerArg>
|
||||
</compilerArgs>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>com.google.errorprone</groupId>
|
||||
<artifactId>error_prone_core</artifactId>
|
||||
<version>${error-prone.version}</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>com.uber.nullaway</groupId>
|
||||
<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>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<configuration>
|
||||
<!-- https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8212233 -->
|
||||
<source>8</source>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
@@ -1180,6 +1130,12 @@
|
||||
<configuration>
|
||||
<!-- TODO: remove when CI upgrades past ubuntu 1804 -->
|
||||
<nodeVersion>${node.version}</nodeVersion>
|
||||
<!-- The default value for node-download-url is set in the properties of this POM -->
|
||||
<!-- This can be overriden in the Maven settings.xml or via the command line -->
|
||||
<!-- On Jenkins we override this property in Maven settings.xml to point to USW1 to download Node -->
|
||||
<!-- When pointing to USW1 we use the serverId spring-commercial-release in settings.xml to authenticate with USW1 -->
|
||||
<nodeDownloadUrl>${node-download-url}</nodeDownloadUrl>
|
||||
<nodeDownloadServerId>spring-commercial-release</nodeDownloadServerId>
|
||||
<options>
|
||||
<option>--to-dir=target/antora/site</option>
|
||||
<option>--stacktrace</option>
|
||||
@@ -1249,8 +1205,8 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>${ant.version}</version>
|
||||
<artifactId>ant-nodeps</artifactId>
|
||||
<version>${ant-nodeps.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.tigris.antelope</groupId>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-build-dependencies</artifactId>
|
||||
<version>5.0.1</version>
|
||||
<version>4.3.4</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,15 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-dependencies</artifactId>
|
||||
<version>4.0.2</version>
|
||||
<version>3.5.15</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<spring-boot.version>4.0.2</spring-boot.version>
|
||||
<spring-boot.version>3.5.15</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>
|
||||
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
@@ -92,6 +92,16 @@
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>milestone</id>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>repo.spring.io</id>
|
||||
<name>Spring Milestone Repository</name>
|
||||
<url>https://repo.spring.io/libs-milestone-local</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>central</id>
|
||||
<distributionManagement>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-build</artifactId>
|
||||
<version>5.0.1</version>
|
||||
<version>4.3.4</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="true"/>
|
||||
value="false"/>
|
||||
</module>
|
||||
|
||||
<!-- Block Checks -->
|
||||
@@ -121,7 +121,7 @@
|
||||
<property name="authorFormat" value=".+\s.+"/>
|
||||
</module>
|
||||
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
|
||||
<property name="accessModifiers" value="public"/>
|
||||
<property name="scope" value="public"/>
|
||||
</module>
|
||||
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
|
||||
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
|
||||
|
||||
@@ -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.1</version>
|
||||
<version>4.3.4</version>
|
||||
<artifactId>spring-cloud-dependencies-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>spring-cloud-dependencies-parent</name>
|
||||
@@ -70,7 +70,7 @@
|
||||
</developers>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<central-publishing-maven-plugin.version>0.9.0</central-publishing-maven-plugin.version>
|
||||
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
|
||||
</properties>
|
||||
<distributionManagement>
|
||||
<downloadUrl>https://github.com/spring-cloud</downloadUrl>
|
||||
@@ -92,6 +92,16 @@
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>milestone</id>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>repo.spring.io</id>
|
||||
<name>Spring Milestone Repository</name>
|
||||
<url>https://repo.spring.io/libs-milestone-local</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>central</id>
|
||||
<distributionManagement>
|
||||
|
||||
Reference in New Issue
Block a user