From df6df5d1ddca7df9fb1ca6a7097976e7e691da24 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 15 Dec 2021 16:55:17 +0000 Subject: [PATCH] Update SNAPSHOT to 3.0.5 --- README.adoc | 51 +++++++++++++++++++ docs/pom.xml | 2 +- pom.xml | 8 +-- spring-cloud-netflix-dependencies/pom.xml | 4 +- .../pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 63 insertions(+), 12 deletions(-) diff --git a/README.adoc b/README.adoc index edcfcb82f..a7f1087d4 100644 --- a/README.adoc +++ b/README.adoc @@ -323,6 +323,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] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + +---- + +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] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + org.joda.time.base.BaseDateTime + .*module-info + + + changelog.txt + + + + + + + +---- + + == License The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here]. diff --git a/docs/pom.xml b/docs/pom.xml index 7e6e54e35..cad9385e4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 018165f28..d17fddf63 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.0.4 + 3.0.5 @@ -21,8 +21,8 @@ netflix - 3.0.5-SNAPSHOT - 3.0.6-SNAPSHOT + 3.0.5 + 3.0.6 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index d9f76b8df..06edd565c 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-netflix-dependencies - 3.0.5-SNAPSHOT + 3.0.5 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index aa5fcf86c..24e6956a8 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index e9fa1b2c3..bca89e5ae 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 4a1ef3122..a2908f2b9 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 068b1a137..b5fa000d3 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 62c17e15c..65c7a1856 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server