From f6a5a3eea19e62085f8d6a86fb89bcc92ddd7960 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 17 Oct 2018 15:45:12 -0400 Subject: [PATCH 01/12] Bumping the boot version for Finchley.SR2 release --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3d42bfce..578396f4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.0.5.RELEASE + 2.0.6.RELEASE 2.0.4.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 52f7d3c9..11f9bfbf 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-dependencies - 2.0.5.RELEASE + 2.0.6.RELEASE UTF-8 1.16.14 - 2.0.5.RELEASE + 2.0.6.RELEASE From 6a41df677a979c720685e0549c3bde17de7d87d3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Oct 2018 15:38:38 +0000 Subject: [PATCH 02/12] Update SNAPSHOT to 2.0.4.RELEASE --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 80319aed..9fc42df0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-build diff --git a/pom.xml b/pom.xml index 578396f4..0b5a959b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -28,7 +28,7 @@ ${basedir} ${project.artifactId} 2.0.6.RELEASE - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 11f9bfbf..6b84c7b8 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 - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent. diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index fc0c9a92..87bb5155 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index ec09e2c7..1d5de935 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 97ffe0a4068daeca233ef2ce4f6dce63f03ce48a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Oct 2018 15:40:08 +0000 Subject: [PATCH 03/12] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9fc42df0..80319aed 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 0b5a959b..578396f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -28,7 +28,7 @@ ${basedir} ${project.artifactId} 2.0.6.RELEASE - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 6b84c7b8..11f9bfbf 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 - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent. diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 87bb5155..fc0c9a92 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 1d5de935..ec09e2c7 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 3a68656c2313b60659f216982ef7d71fd26b567b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Oct 2018 15:40:08 +0000 Subject: [PATCH 04/12] Bumping versions to 2.0.5.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 80319aed..4bb38145 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index 578396f4..13dbd818 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -28,7 +28,7 @@ ${basedir} ${project.artifactId} 2.0.6.RELEASE - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 11f9bfbf..b385a13e 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 - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent. diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index fc0c9a92..2b15d42b 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index ec09e2c7..bb8bdfe6 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 4e61a5a4c2daad6dc2944cea77683ab11de3d043 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Sat, 12 Jan 2019 12:50:07 -0500 Subject: [PATCH 05/12] Bumps boot to 2.0.8.RELEASE --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 13dbd818..2f8a5d35 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.0.6.RELEASE + 2.0.8.RELEASE 2.0.5.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index b385a13e..03da5b8c 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-dependencies - 2.0.6.RELEASE + 2.0.8.RELEASE UTF-8 1.16.14 - 2.0.6.RELEASE + 2.0.8.RELEASE From 8b6fb7d48b21a4eca66a74de12fd23821c72d1a9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 14 Feb 2019 17:16:14 +0000 Subject: [PATCH 06/12] Bumping versions --- README.adoc | 134 ++++++++++++++++++++++++ pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 +- 3 files changed, 137 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index ea497299..5daba185 100644 --- a/README.adoc +++ b/README.adoc @@ -42,6 +42,8 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging: == Contributing +:spring-cloud-build-branch: master + Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want @@ -87,6 +89,138 @@ added after the original pull request but before a merge. if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). +=== Checkstyle + +Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are: + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    └── checkstyle.xml <1> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules + +==== Checkstyle configuration + +Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins. + +.pom.xml +---- + +true <1> + true + <2> + true + <3> + + + + + <4> + io.spring.javaformat + spring-javaformat-maven-plugin + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + +---- +<1> Fails the build upon Checkstyle errors +<2> Fails the build upon Checkstyle violations +<3> Checkstyle analyzes also the test sources +<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules +<5> Add checkstyle plugin to your build and reporting phases + +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-suppresions.xml +---- + + + + + + +---- + +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: + +```bash +$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig +$ touch .springformat +``` + +=== IDE setup + +==== Intellij IDEA + +In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    ├── checkstyle.xml <1> +    └── intellij +       ├── Intellij_Project_Defaults.xml <4> +       └── Intellij_Spring_Boot_Java_Conventions.xml <5> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules +<4> Project defaults for Intellij that apply most of Checkstyle rules +<5> Project style conventions for Intellij that apply most of Checkstyle rules + +.Code style + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file. + +.Inspection profiles + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file. + +.Checkstyle + +To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle] + +Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: + +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. +- `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. + == Reusing the documentation Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains diff --git a/pom.xml b/pom.xml index 2f8a5d35..13dbd818 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.0.8.RELEASE + 2.0.6.RELEASE 2.0.5.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 03da5b8c..b385a13e 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-dependencies - 2.0.8.RELEASE + 2.0.6.RELEASE UTF-8 1.16.14 - 2.0.8.RELEASE + 2.0.6.RELEASE From 677ed92bcb2a7d176c45ccf8fe703be5e8b42449 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 14 Feb 2019 18:17:58 +0100 Subject: [PATCH 07/12] Update pom.xml --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4bb38145..224327d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -14,7 +14,7 @@ spring-cloud-build - 1.2.x,1.3.x + 1.2.x,1.3.x,2.0.x ${basedir}/.. ${basedir}/src/main From 4c0ff24db68180b2d67525b3325d5d6692b1f659 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 14 Feb 2019 17:20:37 +0000 Subject: [PATCH 08/12] Bumping versions --- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 13dbd818..2f8a5d35 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.0.6.RELEASE + 2.0.8.RELEASE 2.0.5.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index b385a13e..03da5b8c 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -12,12 +12,12 @@ org.springframework.boot spring-boot-dependencies - 2.0.6.RELEASE + 2.0.8.RELEASE UTF-8 1.16.14 - 2.0.6.RELEASE + 2.0.8.RELEASE From 6a78cf2e8560466afbfa1529bcfffee4119d00d6 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Feb 2019 11:29:56 -0500 Subject: [PATCH 09/12] 2.0.5.RELEASE --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 224327d1..e8e77a35 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.0.5.BUILD-SNAPSHOT + 2.0.5.RELEASE spring-cloud-build diff --git a/pom.xml b/pom.xml index 2f8a5d35..b7da7e5f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.0.5.BUILD-SNAPSHOT + 2.0.5.RELEASE pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -28,7 +28,7 @@ ${basedir} ${project.artifactId} 2.0.8.RELEASE - 2.0.5.BUILD-SNAPSHOT + 2.0.5.RELEASE ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 03da5b8c..cd59dc37 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 - 2.0.5.BUILD-SNAPSHOT + 2.0.5.RELEASE spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent. diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 2b15d42b..e996d10d 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.5.BUILD-SNAPSHOT + 2.0.5.RELEASE diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index bb8bdfe6..de533642 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.0.5.BUILD-SNAPSHOT + 2.0.5.RELEASE spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From e26366fbce4cd42db6d20dd0279009bdffba491a Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Feb 2019 11:38:14 -0500 Subject: [PATCH 10/12] Bumping to 2.0.6.BUILD-SNAPSHOT --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e8e77a35..c4028a05 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT spring-cloud-build diff --git a/pom.xml b/pom.xml index b7da7e5f..f1565543 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects @@ -28,7 +28,7 @@ ${basedir} ${project.artifactId} 2.0.8.RELEASE - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT ${project.build.directory}/build-docs diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index cd59dc37..759125d5 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 - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent. diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index e996d10d..6b2d3bf3 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index de533642..89a2aee6 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent From 94e1a06065068bf6a49acb6e15f0e7ee981ade45 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Sat, 16 Mar 2019 08:45:22 -0700 Subject: [PATCH 11/12] URL Cleanup (#94) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://maven.apache.org/xsd/maven-4.0.0.xsd with 5 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). * http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch with 1 occurrences migrated to: https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch ([https](https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch) result 200). * http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin with 1 occurrences migrated to: https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin ([https](https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin) result 200). * http://www.apache.org/licenses/LICENSE-2.0 with 4 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). * http://www.spring.io with 6 occurrences migrated to: https://www.spring.io ([https](https://www.spring.io) result 301). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 with 10 occurrences * http://www.w3.org/2001/XMLSchema-instance with 5 occurrences --- docs/pom.xml | 2 +- docs/src/main/asciidoc/ghpages.sh | 4 ++-- mvnw | 2 +- mvnw.cmd | 2 +- pom.xml | 12 ++++++------ spring-cloud-build-dependencies/pom.xml | 2 +- spring-cloud-build-tools/pom.xml | 2 +- spring-cloud-dependencies-parent/pom.xml | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c4028a05..174e53ac 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,6 +1,6 @@ + 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-build-docs spring-cloud-build-docs diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 09435af1..68b8a1a1 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -49,7 +49,7 @@ function check_if_anything_to_sync() { function retrieve_current_branch() { # Code getting the name of the current branch. For master we want to publish as we did until now - # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch + # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch # If there is a branch already passed will reuse it - otherwise will try to find it CURRENT_BRANCH=${BRANCH} if [[ -z "${CURRENT_BRANCH}" ]] ; then @@ -168,7 +168,7 @@ function copy_docs_for_current_version() { COMMIT_CHANGES="yes" else echo -e "Current branch is [${CURRENT_BRANCH}]" - # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin + # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH} echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder" diff --git a/mvnw b/mvnw index 25f750cb..a08b219e 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/mvnw.cmd b/mvnw.cmd index b0dc0e7e..7ecd01d8 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -7,7 +7,7 @@ @REM "License"); you may not use this file except in compliance @REM with the License. You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM https://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, @REM software distributed under the License is distributed on an diff --git a/pom.xml b/pom.xml index f1565543..23f3869e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + 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 spring-cloud-build @@ -63,7 +63,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -87,7 +87,7 @@ limitations under the License. Dave Syer dsyer at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io lead @@ -97,7 +97,7 @@ limitations under the License. Spencer Gibb sgibb at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io lead @@ -107,7 +107,7 @@ limitations under the License. Marcin Grzejszczak mgrzejszczak at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io developer @@ -117,7 +117,7 @@ limitations under the License. Ryan Baxter rbaxter at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io developer diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 759125d5..737ff366 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -1,7 +1,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 spring-cloud-build-dependencies diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6b2d3bf3..8350c174 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -1,7 +1,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 spring-cloud-build-tools diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index 89a2aee6..a88f9fbc 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -1,6 +1,6 @@ + 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 2.0.6.BUILD-SNAPSHOT @@ -24,7 +24,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -48,7 +48,7 @@ limitations under the License. Dave Syer dsyer at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io Project lead @@ -58,7 +58,7 @@ limitations under the License. Spencer Gibb sgibb at pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io Project lead From 35d8230662a17d2a3e86b439de2b2c540cfcfef8 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 21 Mar 2019 12:08:21 -0400 Subject: [PATCH 12/12] Updating checkstyle rules to make sure header uses https --- .../src/main/resources/checkstyle-header.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt b/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt index 154aaa1a..39429ee6 100644 --- a/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt +++ b/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt @@ -5,7 +5,7 @@ ^\Q * you may not use this file except in compliance with the License.\E$ ^\Q * You may obtain a copy of the License at\E$ ^\Q *\E$ -^\Q * http://www.apache.org/licenses/LICENSE-2.0\E$ +^\Q * https://www.apache.org/licenses/LICENSE-2.0\E$ ^\Q *\E$ ^\Q * Unless required by applicable law or agreed to in writing, software\E$ ^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$