Compare commits

...
94 Commits
Author SHA1 Message Date
buildmaster e5d07102d3 Update SNAPSHOT to 3.1.0 2021-11-29 18:42:36 +00:00
spencergibb fb3f9dac01 Adds maven-gpg-plugin.version to dependencies pom 2021-11-29 12:54:46 -05:00
spencergibb b52e6489fa Merge remote-tracking branch 'origin/main'
# Conflicts:
#	pom.xml
2021-11-29 12:04:29 -05:00
buildmaster b91b10a197 Bumping versions 2021-11-29 17:01:00 +00:00
buildmaster ee66ee4791 Bumping versions 2021-11-26 08:12:59 +00:00
Olga Maciaszek-Sharma 4493fa05ea Add duplicate finder (#220)
* Add duplicate finder to plugins and executions.

* Add duplicate finder to plugins and executions.

* Fix docs.
2021-11-26 08:41:00 +01:00
spencergibb e0c89da706 Merge branch '3.0.x' 2021-11-23 15:28:56 -05:00
Marcin Grzejszczak 74842d8a7f Uses nexus staging plugin to deploy to central (#216)
* Uses nexus staging plugin to deploy to central

* Don't automatically close
2021-11-23 15:25:26 -05:00
buildmaster e874b69be7 Bumping versions 2021-11-19 19:30:30 +00:00
buildmaster b8132405ba Bumping versions 2021-11-03 19:18:16 +00:00
buildmaster 604011cb50 Going back to snapshots 2021-11-01 18:54:48 +00:00
buildmaster 036039ae77 Update SNAPSHOT to 3.1.0-RC1 2021-11-01 18:53:40 +00:00
buildmaster af34adfc11 Bumping versions 2021-10-22 15:25:08 +00:00
buildmaster 2741145bf3 Going back to snapshots 2021-10-14 14:58:32 +00:00
buildmaster 8902fd634c Update SNAPSHOT to 3.1.0-M3 2021-10-14 14:55:50 +00:00
buildmaster 3a21352bc6 Bumping versions 2021-10-06 17:12:36 +00:00
Jonatan Ivanov f27797c8ac Merge pull request #218 from robertmcnees/gh_217
Removed .travis and scripts reference from documentation
2021-09-27 12:21:43 -07:00
buildmaster e5fa41b0db Going back to snapshots 2021-09-27 16:26:31 +00:00
buildmaster 4b87554b2b Update SNAPSHOT to 3.1.0-M2 2021-09-27 16:25:23 +00:00
Robert McNeesandJonatan Ivanov bfc8b98a21 Update docs/src/main/asciidoc/building-base.adoc
Co-authored-by: Jonatan Ivanov <jonatan.ivanov@gmail.com>
2021-09-27 11:06:00 -04:00
Robert McNees e331da87fa Removed .travis and scripts reference from documentation 2021-09-22 07:38:59 -04:00
buildmaster 3e6b8144b6 Bumping versions to 3.0.5-SNAPSHOT after release 2021-09-20 14:09:33 +00:00
buildmaster b2b9e8fa90 Going back to snapshots 2021-09-20 14:09:33 +00:00
buildmaster e52df5d684 Update SNAPSHOT to 3.0.4 2021-09-20 14:07:37 +00:00
Olga MaciaszekSharma 5a19120508 Upgrade Boot to 2.4.10. 2021-09-20 15:05:57 +02:00
buildmaster 61e958b63d Bumping versions 2021-09-09 18:17:42 +00:00
Marcin Grzejszczak 9fb56b8b24 Spring Boot 2.6.0-SNAPSHOT 2021-09-06 13:11:27 +02:00
buildmaster d8f30876d3 Bumping versions 2021-08-18 08:14:23 +00:00
Marcin Grzejszczak 74b2e09838 Updated Boot to 2.6.0-SNAPSHOT 2021-08-17 18:40:27 +02:00
spencergibb d6ba904dcc Updates boot to 2.4.10-SNAPSHOT
fix for spring-amqp spring-integration version mismatch
2021-07-26 17:49:15 -04:00
spencergibb c154f40cdf Updates boot to 2.4.9 2021-07-26 12:56:48 -04:00
buildmaster 88906d3bab Bumping versions 2021-07-23 18:55:47 +00:00
spencergibb 3f3613b1ad adds maven.config back with just spring profile 2021-07-23 12:58:08 -04:00
buildmaster eb1faa3134 Bumping versions 2021-07-23 08:14:47 +00:00
buildmaster 8fed4a9249 Going back to snapshots 2021-07-23 00:40:58 +00:00
buildmaster f6e8e4b71b Update SNAPSHOT to 3.1.0-M1 2021-07-23 00:39:40 +00:00
Ryan Baxter f9386aa621 Using Boot 2.6.0-M1 2021-07-22 20:33:25 -04:00
Ryan Baxter 74fc896653 Adding plugin repositories to docs profile 2021-07-22 20:06:34 -04:00
Marcin Grzejszczak ad51c6b78f Bumping boot to 2.4.8 2021-07-20 16:37:38 +02:00
Marcin Grzejszczak a074b31b30 Downgrading exec-maven-plugin to speed up our builds
Currently with the updated plugin we're trying to fetch jars with a http:// URL
2021-07-16 15:41:27 +02:00
Spencer Gibb f1ec549ce6 Downgrade maven failsafe plugin 2021-07-15 14:00:22 -04:00
Olga MaciaszekSharma 216746d39b Downgrade surefire-plugin and surefire-reporting-plugin to 2.22.2. 2021-07-15 19:24:18 +02:00
Marcin Grzejszczak b41d78f5c6 Bumped jacoco 2021-07-13 10:22:02 +02:00
Marcin Grzejszczak 9247f06db2 Bumped versions of libs (#215) 2021-07-13 10:02:16 +02:00
Marcin Grzejszczak 3af8d0feae Adds -Pspring to maven build command 2021-07-12 12:40:28 +02:00
Marcin Grzejszczak 8d16702238 Fixde workflows 2021-07-12 12:37:05 +02:00
Spencer Gibb 8de921489f Replace symlink with include (#214)
* removed index.adoc symlink

* Replace symlink with include
2021-07-12 12:06:02 +02:00
spencergibb 8a2deb21d6 Updates boot to version 2.6.0-SNAPSHOT 2021-07-08 14:46:11 -04:00
spencergibb 82954c4313 Merge branch '3.1.x' 2021-07-08 14:34:48 -04:00
Christianandcgerrard 3b59bc688c Updating asciidoctorJ versions, handling deprecated constructors, removing unused import. (#213)
Co-authored-by: cgerrard <christian@nomena.io>
2021-07-01 12:36:19 +02:00
buildmaster 00f1b3426f Bumping versions 2021-06-22 00:03:58 +00:00
buildmaster e2021b552a Bumping versions 2021-06-11 08:12:58 +00:00
buildmaster 0b717b0c61 Bumping versions 2021-06-10 16:30:09 +00:00
buildmaster 6ff762f675 Bumping versions 2021-05-28 08:12:56 +00:00
buildmaster 5d61e6f832 Bumping versions 2021-05-27 08:12:43 +00:00
buildmaster c109e0520e Bumping versions to 3.0.4-SNAPSHOT after release 2021-05-26 12:49:50 +00:00
buildmaster d1470dd08a Going back to snapshots 2021-05-26 12:49:50 +00:00
buildmaster 0cc33f5c86 Update SNAPSHOT to 3.0.3 2021-05-26 12:47:45 +00:00
Olga MaciaszekSharma d1f60f83b6 Merge remote-tracking branch 'main' into 3.1.x 2021-05-13 12:54:45 +02:00
Olga MaciaszekSharma ab3faaebe0 Merge remote-tracking branch 'origin/2.3.x' into main 2021-05-13 12:51:06 +02:00
Olga MaciaszekSharma 7cc037d7cc Switch to GH actions. 2021-05-13 12:46:18 +02:00
Olga MaciaszekSharma 8d406e1e3f Add GH actions setup. 2021-05-13 12:27:26 +02:00
Olga MaciaszekSharma b6286b926e Revert "Try building with docs on Circle."
This reverts commit 2d1f2b3e11.
2021-05-13 12:24:48 +02:00
Olga MaciaszekSharma 2d1f2b3e11 Try building with docs on Circle. 2021-05-13 12:23:06 +02:00
Olga MaciaszekSharma 2b254a0769 Add debug flag. 2021-05-13 12:16:55 +02:00
Olga MaciaszekSharma a3d39519d9 Init 3.1.x. 2021-05-13 12:01:08 +02:00
Olga MaciaszekSharma 661f5f87bd Merge remote-tracking branch 'origin/main' into main 2021-05-12 17:15:57 +02:00
buildmaster 25eeb5d7dc Bumping versions 2021-05-04 20:58:30 +00:00
spencergibb cef2a68ae1 Updates build to version 2.3.5.BUILD-SNAPSHOT 2021-04-20 15:27:18 -04:00
buildmaster b9e5eb8bd2 Bumping versions 2021-04-20 19:03:50 +00:00
spencergibb 53a08a58ee Updates build to version 2.3.4.BUILD-SNAPSHOT 2021-04-20 12:58:16 -04:00
buildmaster 58fe04d142 Bumping versions 2021-04-16 07:11:44 +00:00
buildmaster 4917243002 Bumping versions to 2.3.4.SNAPSHOT after release 2021-04-15 20:57:59 +00:00
buildmaster dc671e5961 Going back to snapshots 2021-04-15 20:57:59 +00:00
buildmaster b849224d34 Update SNAPSHOT to 2.3.3.RELEASE 2021-04-15 20:56:30 +00:00
buildmaster 94db972ad8 Bumping versions 2021-04-08 18:13:00 +00:00
buildmaster d559da0b65 Bumping versions 2021-03-18 16:22:46 +00:00
spencergibb 416cadcd87 Ignore milestone plugin versions in releaser.
Fixes gh-210
2021-03-18 12:14:54 -04:00
buildmaster 80dcb06760 Bumping versions 2021-03-18 07:12:19 +00:00
buildmaster 6a702ea444 Bumping versions 2021-03-12 07:12:25 +00:00
buildmaster 190cb86ef7 Bumping versions to 3.0.3-SNAPSHOT after release 2021-03-11 16:01:02 +00:00
buildmaster 0b3eb08ca7 Going back to snapshots 2021-03-11 16:01:02 +00:00
buildmaster f578303c08 Update SNAPSHOT to 3.0.2 2021-03-11 15:59:08 +00:00
Marcin Grzejszczak 39a1c393e4 Removed Bintray plugin 2021-03-08 09:08:52 +01:00
Marcin Grzejszczak 384013e395 Bumping Boot to 2.3.9 2021-02-24 12:10:29 +01:00
buildmaster ba39434f18 Bumping versions 2021-02-18 17:39:31 +00:00
Marcin Grzejszczak 2c70866ae7 Fixed wrong version 2021-02-15 11:55:42 +01:00
buildmaster 93716b3d31 Bumping versions to 2.3.3.SNAPSHOT after release 2021-02-08 20:51:44 +00:00
buildmaster 8c93d9c597 Going back to snapshots 2021-02-08 20:51:44 +00:00
buildmaster 1b50fb3d96 Update SNAPSHOT to 2.3.2.RELEASE 2021-02-08 20:47:35 +00:00
buildmaster b0aea38029 Bumping versions 2021-01-28 01:17:03 +00:00
buildmaster 258905c660 Bumping versions to 3.0.2-SNAPSHOT after release 2021-01-27 16:27:41 +00:00
buildmaster 540d3b3fe5 Going back to snapshots 2021-01-27 16:27:41 +00:00
Marcin Grzejszczak 4bac0474d9 Removed plugins repo 2020-12-18 10:31:04 +01:00
15 changed files with 353 additions and 153 deletions
-39
View File
@@ -1,39 +0,0 @@
version: 2
jobs:
build:
docker:
- image: springcloud/pipeline-base
user: appuser
environment:
_JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
TERM: dumb
branches:
ignore:
- gh-pages # list of branches to ignore
steps:
- checkout
- restore_cache:
key: sc-build-{{ .Branch }}
- run:
name: "Download dependencies"
command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
- save_cache:
key: sc-build-{{ .Branch }}
paths:
- ~/.m2
- run:
name: "Running build"
command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- run:
name: "Aggregate test results"
when: always
command: |
mkdir -p ~/junit/
find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
bash <(curl -s https://codecov.io/bash)
- store_artifacts:
path: ~/junit/
destination: artifacts
- store_test_results:
path: ~/junit/
destination: testartifacts
+35
View File
@@ -0,0 +1,35 @@
# 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 ]
pull_request:
branches: [ main ]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
java: ["8", "11", "16"]
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build with Maven
run: ./mvnw clean install -B -U -Pspring
+1 -1
View File
@@ -1 +1 @@
-DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot -P spring
-P spring
+52 -1
View File
@@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead.
////
image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]
Spring Cloud Build is a common utility project for Spring Cloud
to use for plugin and dependency management.
@@ -227,6 +227,57 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
=== Duplicate Finder
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
==== 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 projecst's `pom.xml`.
.pom.xml
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
<ignoredClassPattern>.*module-info</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>
----
== Flattening the POMs
To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
+2 -2
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</parent>
<properties>
<docs.main>spring-cloud-build</docs.main>
@@ -85,7 +85,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>${maven-deploy-plugin.version}</version>
</plugin>
</plugins>
</build>
+1 -1
View File
@@ -1,4 +1,4 @@
image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]
Spring Cloud Build is a common utility project for Spring Cloud
to use for plugin and dependency management.
+2 -16
View File
@@ -22,23 +22,9 @@ the `.mvn` configuration, so if you find you have to do it to make a
build succeed, please raise a ticket to get the settings added to
source control.
For hints on how to build the project look in `.travis.yml` if there
is one. There should be a "script" and maybe "install" command. Also
look at the "services" section to see if any services need to be
running locally (e.g. mongo or rabbit). Ignore the git-related bits
that you might find in "before_install" since they're related to setting git
credentials and you already have those.
The projects that require middleware (i.e. Redis) for testing generally
require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
The projects that require middleware generally include a
`docker-compose.yml`, so consider using
https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
in Docker containers. See the README in the
https://github.com/spring-cloud-samples/scripts[scripts demo
repository] for specific instructions about the common cases of mongo,
rabbit and redis.
NOTE: If all else fails, build with the command from `.travis.yml` (usually
`./mvnw install`).
=== Documentation
+51
View File
@@ -177,3 +177,54 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
=== Duplicate Finder
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
==== 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 projecst's `pom.xml`.
.pom.xml
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
----
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
[source,xml]
----
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
<ignoredClassPattern>.*module-info</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>
----
-1
View File
@@ -1 +0,0 @@
spring-cloud-build.adoc
+1
View File
@@ -0,0 +1 @@
include::spring-cloud-build.adoc[]
@@ -51,15 +51,17 @@ public class ReadmeMain {
}
private Options options(File input, File output) {
Attributes attributes = new Attributes();
attributes.setAllowUriRead(true);
attributes.setAttribute("project-root", output.getParent());
Options options = new Options();
options.setSourceDir(input.getParent());
options.setBaseDir(input.getParent());
options.setAttributes(attributes);
options.setSafe(SafeMode.UNSAFE);
options.setParseHeaderOnly(true);
return options;
Attributes attributes = Attributes.builder()
.allowUriRead(true)
.attribute("project-root", output.getParent())
.build();
return Options.builder()
.sourceDir(input.getParentFile())
.baseDir(input.getParentFile())
.attributes(attributes)
.safe(SafeMode.UNSAFE)
.parseHeaderOnly(true)
.build();
}
}
@@ -7,7 +7,6 @@ import java.nio.file.Files;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.registerCustomDateFormat;
import static org.assertj.core.api.BDDAssertions.then;
class ReadmeMainTests {
+135 -43
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<packaging>pom</packaging>
<name>Spring Cloud Parent</name>
<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,23 +28,23 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<spring-boot.version>2.4.2</spring-boot.version>
<spring-cloud-build.version>3.0.1</spring-cloud-build.version>
<spring-boot.version>2.6.1</spring-boot.version>
<spring-cloud-build.version>3.1.0</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>
<spring-doc-resources.version>0.2.2.RELEASE</spring-doc-resources.version>
<spring-asciidoctor-extensions-boot.version>0.5.0
<spring-asciidoctor-extensions-boot.version>0.6.0
</spring-asciidoctor-extensions-boot.version>
<spring-asciidoctor-extensions-block.version>0.5.0
<spring-asciidoctor-extensions-block.version>0.6.0
</spring-asciidoctor-extensions-block.version>
<asciidoctorj-pdf.version>1.5.3</asciidoctorj-pdf.version>
<asciidoctorj-diagram.version>2.0.2</asciidoctorj-diagram.version>
<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
<asciidoctorj-diagram.version>2.1.2</asciidoctorj-diagram.version>
<guides-project.version>${project.version}</guides-project.version>
<guides-update.phase>deploy</guides-update.phase>
<revision>${project.version}</revision>
<asciidoctorj.version>2.4.1</asciidoctorj.version>
<jruby-complete.version>9.2.7.0</jruby-complete.version>
<asciidoctorj.version>2.5.1</asciidoctorj.version>
<jruby-complete.version>9.2.19.0</jruby-complete.version>
<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -58,31 +58,31 @@
<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>8.29</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.25</spring-javaformat.version>
<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<puppycrawl-tools-checkstyle.version>8.43</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.26</spring-javaformat.version>
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>3.0.0-M5</maven-surefire-report-plugin.version>
<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<git-commit-id-plugin.version>3.0.0</git-commit-id-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<git-commit-id-plugin.version>4.0.5</git-commit-id-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
<license-maven-plugin.version>1.16</license-maven-plugin.version>
<spring-javaformat-checkstyle.version>0.0.25</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<pitest-maven.version>1.5.2</pitest-maven.version>
<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
<artifactory-maven-plugin.version>3.2.0</artifactory-maven-plugin.version>
<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
<spring-javaformat-checkstyle.version>0.0.26</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<pitest-maven.version>1.6.7</pitest-maven.version>
<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
<disable.checks>false</disable.checks>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failOnViolation>true
@@ -100,7 +100,7 @@
<checkstyle.additional.suppressions.file>
${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
</checkstyle.additional.suppressions.file>
<nohttp-checkstyle.version>0.0.5.RELEASE</nohttp-checkstyle.version>
<nohttp-checkstyle.version>0.0.7</nohttp-checkstyle.version>
<disable.nohttp.checks>true</disable.nohttp.checks>
<antelopetasks.version>3.2.10</antelopetasks.version>
<ant-nodeps.version>1.8.1</ant-nodeps.version>
@@ -114,12 +114,32 @@
<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
<javadoc.failOnError>false</javadoc.failOnError>
<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
<upload-docs-zip.phase>none</upload-docs-zip.phase>
<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.0</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>
<duplicate-finder-maven-plugin.failBuildInCaseOfConflict>true</duplicate-finder-maven-plugin.failBuildInCaseOfConflict>
<duplicate-finder-maven-plugin.checkCompileClasspath>true</duplicate-finder-maven-plugin.checkCompileClasspath>
<duplicate-finder-maven-plugin.checkRuntimeClasspath>true</duplicate-finder-maven-plugin.checkRuntimeClasspath>
<duplicate-finder-maven-plugin.checkTestClasspath>true</duplicate-finder-maven-plugin.checkTestClasspath>
<duplicate-finder-maven-plugin.skip>false</duplicate-finder-maven-plugin.skip>
<duplicate-finder-maven-plugin.quiet>false</duplicate-finder-maven-plugin.quiet>
<duplicate-finder-maven-plugin.preferLocal>true</duplicate-finder-maven-plugin.preferLocal>
<duplicate-finder-maven-plugin.useResultFile>true</duplicate-finder-maven-plugin.useResultFile>
<duplicate-finder-maven-plugin.resultFileMinClasspathCount>2</duplicate-finder-maven-plugin.resultFileMinClasspathCount>
<duplicate-finder-maven-plugin.resultFile>${project.build.directory}/duplicate-finder-result.xml</duplicate-finder-maven-plugin.resultFile>
<duplicate-finder-maven-plugin.includeBootClasspath>false</duplicate-finder-maven-plugin.includeBootClasspath>
<duplicate-finder-maven-plugin.bootClasspathProperty>sun.boot.class.path</duplicate-finder-maven-plugin.bootClasspathProperty>
<duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>true</duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>
<duplicate-finder-maven-plugin.includePomProjects>false</duplicate-finder-maven-plugin.includePomProjects>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>
<dependencyManagement>
<dependencies>
@@ -141,7 +161,7 @@
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
<comments>
Copyright 2014-2015 the original author or authors.
Copyright 2014-2021 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -641,6 +661,40 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<version>${duplicate-finder-maven-plugin.version}</version>
<executions>
<execution>
<id>duplicate-validation</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<printEqualFiles>${duplicate-finder-maven-plugin.printEqualFiles}</printEqualFiles>
<failBuildInCaseOfDifferentContentConflict>${duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict}</failBuildInCaseOfDifferentContentConflict>
<failBuildInCaseOfEqualContentConflict>${duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict}</failBuildInCaseOfEqualContentConflict>
<failBuildInCaseOfConflict>${duplicate-finder-maven-plugin.failBuildInCaseOfConflict}</failBuildInCaseOfConflict>
<checkCompileClasspath>${duplicate-finder-maven-plugin.checkCompileClasspath}</checkCompileClasspath>
<checkRuntimeClasspath>${duplicate-finder-maven-plugin.checkRuntimeClasspath}</checkRuntimeClasspath>
<checkTestClasspath>${duplicate-finder-maven-plugin.checkTestClasspath}</checkTestClasspath>
<skip>${duplicate-finder-maven-plugin.skip}</skip>
<quiet>${duplicate-finder-maven-plugin.quiet}</quiet>
<preferLocal>${duplicate-finder-maven-plugin.preferLocal}</preferLocal>
<useResultFile>${duplicate-finder-maven-plugin.useResultFile}</useResultFile>
<resultFileMinClasspathCount>${duplicate-finder-maven-plugin.resultFileMinClasspathCount}</resultFileMinClasspathCount>
<resultFile>${duplicate-finder-maven-plugin.resultFile}</resultFile>
<includeBootClasspath>${duplicate-finder-maven-plugin.includeBootClasspath}</includeBootClasspath>
<bootClasspathProperty>${duplicate-finder-maven-plugin.bootClasspathProperty}</bootClasspathProperty>
<useDefaultResourceIgnoreList>${duplicate-finder-maven-plugin.useDefaultResourceIgnoreList}</useDefaultResourceIgnoreList>
<includePomProjects>${duplicate-finder-maven-plugin.includePomProjects}</includePomProjects>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
@@ -692,7 +746,7 @@
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>repo.spring.io</id>
@@ -775,22 +829,30 @@
<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-milestone-local</maven-deploy-plugin.deployZipUrl>
</properties>
</profile>
<profile>
<id>bintray</id>
<distributionManagement>
<repository>
<id>bintray</id>
<name>Jcenter Repository</name>
<url>
https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>central</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>sonatype-nexus-staging</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -808,6 +870,7 @@
</plugins>
</build>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-release-local</maven-deploy-plugin.deployZipUrl>
</properties>
</profile>
@@ -1447,6 +1510,35 @@
</plugins>
</pluginManagement>
</build>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>sonar</id>
@@ -1491,7 +1583,7 @@
<dependency>
<groupId>org.sonarsource.java</groupId>
<artifactId>sonar-jacoco-listeners</artifactId>
<version>3.8</version>
<version>${sonar-jacoco-listeners.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+31 -19
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>3.0.1</version>
<version>3.1.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,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.4.2</version>
<version>2.6.1</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.4.2</spring-boot.version>
<spring-boot.version>2.6.1</spring-boot.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
</properties>
<build>
<plugins>
@@ -62,7 +63,7 @@
<site>
<id>spring-docs</id>
<url>
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
</url>
</site>
<repository>
@@ -87,30 +88,21 @@
</repository>
</distributionManagement>
</profile>
<profile>
<id>bintray</id>
<distributionManagement>
<repository>
<id>bintray</id>
<name>Jcenter Repository</name>
<url>
https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>central</id>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
@@ -119,7 +111,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -130,6 +122,26 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>sonatype-nexus-staging</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</parent>
<dependencies>
<dependency>
+29 -18
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>3.0.1</version>
<version>3.1.0</version>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<packaging>pom</packaging>
<name>spring-cloud-dependencies-parent</name>
@@ -19,7 +19,7 @@
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
<comments>
Copyright 2014-2015 the original author or authors.
Copyright 2014-2021 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@
<site>
<id>spring-docs</id>
<url>
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
</url>
</site>
<repository>
@@ -101,30 +101,21 @@
</repository>
</distributionManagement>
</profile>
<profile>
<id>bintray</id>
<distributionManagement>
<repository>
<id>bintray</id>
<name>Jcenter Repository</name>
<url>
https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>central</id>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
@@ -163,6 +154,26 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<serverId>sonatype-nexus-staging</serverId>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -242,7 +253,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-versions</id>