From e9d2b4a5bb913ff292dc6ee720d9177bdef0536d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 10 Dec 2021 20:10:21 +0000 Subject: [PATCH 1/3] Update SNAPSHOT to 3.0.5 --- README.adoc | 51 ++++++++++++++++++++++++ docs/pom.xml | 2 +- pom.xml | 6 +-- spring-cloud-build-dependencies/pom.xml | 6 +-- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 6 files changed, 60 insertions(+), 9 deletions(-) diff --git a/README.adoc b/README.adoc index ac0a4bc5..910e42c7 100644 --- a/README.adoc +++ b/README.adoc @@ -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] +---- + + + + 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 + + + + + + + +---- + + == 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. diff --git a/docs/pom.xml b/docs/pom.xml index e09b7da2..17cdb3c7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-build diff --git a/pom.xml b/pom.xml index 02e60797..35045660 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 3.0.5-SNAPSHOT + 3.0.5 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 2.4.10 - 3.0.5-SNAPSHOT + 2.4.13 + 3.0.5 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index ddf654fc..8f48d854 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.4.10 + 2.4.13 UTF-8 - 2.4.10 + 2.4.13 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 094fcfc3..32eed2d1 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5-SNAPSHOT + 3.0.5 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 6fbfe7d5..6f1adb87 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 3.0.5-SNAPSHOT + 3.0.5 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 9bf8bd05473e654829a6aaf97d902d2e644f82fe Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 10 Dec 2021 20:11:41 +0000 Subject: [PATCH 2/3] Going back to snapshots --- README.adoc | 51 ------------------------ docs/pom.xml | 2 +- pom.xml | 6 +-- spring-cloud-build-dependencies/pom.xml | 6 +-- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 6 files changed, 9 insertions(+), 60 deletions(-) diff --git a/README.adoc b/README.adoc index 910e42c7..ac0a4bc5 100644 --- a/README.adoc +++ b/README.adoc @@ -227,57 +227,6 @@ 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 - - - - - - - ----- - - == 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. diff --git a/docs/pom.xml b/docs/pom.xml index 17cdb3c7..e09b7da2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5 + 3.0.5-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 35045660..02e60797 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 3.0.5 + 3.0.5-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 2.4.13 - 3.0.5 + 2.4.10 + 3.0.5-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 8f48d854..ddf654fc 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 3.0.5 + 3.0.5-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.4.13 + 2.4.10 UTF-8 - 2.4.13 + 2.4.10 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 32eed2d1..094fcfc3 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5 + 3.0.5-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 6f1adb87..6fbfe7d5 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 3.0.5 + 3.0.5-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 796097342207fafa2c9f9f674f4646437a535505 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 10 Dec 2021 20:11:41 +0000 Subject: [PATCH 3/3] Bumping versions to 3.0.6-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-build-dependencies/pom.xml | 6 +++--- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e09b7da2..7617fa8a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5-SNAPSHOT + 3.0.6-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 02e60797..419450f5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 3.0.5-SNAPSHOT + 3.0.6-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -28,8 +28,8 @@ ${java.version} ${basedir} ${project.artifactId} - 2.4.10 - 3.0.5-SNAPSHOT + 2.4.13 + 3.0.6-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index ddf654fc..81cd8e7a 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 3.0.5-SNAPSHOT + 3.0.6-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.4.10 + 2.4.13 UTF-8 - 2.4.10 + 2.4.13 diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 094fcfc3..9d28c090 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5-SNAPSHOT + 3.0.6-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 6fbfe7d5..a5f42043 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 3.0.5-SNAPSHOT + 3.0.6-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent