From 9da8cc5e486ae53409be24beef6feefd70c39580 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Feb 2022 00:58:11 +0000 Subject: [PATCH] Bumping versions --- README.adoc | 72 ++++++++++++++----- pom.xml | 12 ++-- .../config/ConsulPropertySourceTests.java | 2 +- spring-cloud-consul-dependencies/pom.xml | 2 +- 4 files changed, 63 insertions(+), 25 deletions(-) diff --git a/README.adoc b/README.adoc index 6e90d64f..2b22b5f3 100644 --- a/README.adoc +++ b/README.adoc @@ -280,7 +280,8 @@ See the https://consul.io/intro/index.html[intro] for more information. == Building -:jdkversion: 1.8 + +:jdkversion: 17 === Basic Compile and Test @@ -306,23 +307,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 @@ -556,3 +543,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] +---- + + + + 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 + + + + + + + +---- + diff --git a/pom.xml b/pom.xml index 92b39837..93f41d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 3.0.4 + 3.0.6-SNAPSHOT - 3.0.3 - 3.0.4 - 3.0.5 + 3.0.4-SNAPSHOT + 3.0.6-SNAPSHOT + 3.0.7-SNAPSHOT 1.0.3.RELEASE - 3.0.4 - 3.1.4 + 3.0.7-SNAPSHOT + 3.1.6 1.15.1 diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java index f9a021d1..7cbb444d 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceTests.java @@ -120,7 +120,7 @@ public class ConsulPropertySourceTests { @Test public void testExtraSlashInContext() { ConsulPropertySource source = new ConsulPropertySource("/my/very/custom/context", this.client, - new ConsulConfigProperties()); + new ConsulConfigProperties()); source.init(); assertThat(source.getContext()).as("context was wrong").isEqualTo("my/very/custom/context/"); } diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 631a2b87..80f2933d 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.5-SNAPSHOT + 3.0.6-SNAPSHOT spring-cloud-consul-dependencies