diff --git a/.editorconfig b/.editorconfig index 323872ee..52e6a1af 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -root=true +root = true [*.java] indent_style = tab @@ -13,4 +13,12 @@ continuation_indent_size = 8 [*.xml] indent_style = tab indent_size = 4 -continuation_indent_size = 8 \ No newline at end of file +continuation_indent_size = 8 + +[*.yml] +indent_style = space +indent_size = 2 + +[*.yaml] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/.settings.xml b/.settings.xml index 6c355129..03645e8c 100644 --- a/.settings.xml +++ b/.settings.xml @@ -1,66 +1,68 @@ - - - repo.spring.io - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - - - - spring - true - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - - + + + repo.spring.io + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + + + + spring + + true + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + + diff --git a/README.adoc b/README.adoc index 4df9634a..eeda37f4 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/docs/pom.xml b/docs/pom.xml index 9e0b429a..9d950483 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-cloud-build-docs spring-cloud-build-docs @@ -9,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.1.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT spring-cloud-build diff --git a/docs/src/main/asciidoc/contributing.adoc b/docs/src/main/asciidoc/contributing.adoc index ac8bd575..5b2e49c9 100644 --- a/docs/src/main/asciidoc/contributing.adoc +++ b/docs/src/main/asciidoc/contributing.adoc @@ -1,3 +1,5 @@ +: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 @@ -42,3 +44,135 @@ added after the original pull request but before a merge. * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], 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. \ No newline at end of file diff --git a/docs/src/main/asciidoc/images/intellij-checkstyle.png b/docs/src/main/asciidoc/images/intellij-checkstyle.png new file mode 100644 index 00000000..f02fa65f Binary files /dev/null and b/docs/src/main/asciidoc/images/intellij-checkstyle.png differ diff --git a/docs/src/main/asciidoc/images/intellij-code-style.png b/docs/src/main/asciidoc/images/intellij-code-style.png new file mode 100644 index 00000000..533e65df Binary files /dev/null and b/docs/src/main/asciidoc/images/intellij-code-style.png differ diff --git a/docs/src/main/asciidoc/images/intellij-inspections.png b/docs/src/main/asciidoc/images/intellij-inspections.png new file mode 100644 index 00000000..22dfdd36 Binary files /dev/null and b/docs/src/main/asciidoc/images/intellij-inspections.png differ diff --git a/docs/src/main/ruby/generate_readme.sh b/docs/src/main/ruby/generate_readme.sh index 6d0ce9dc..64c6052c 100755 --- a/docs/src/main/ruby/generate_readme.sh +++ b/docs/src/main/ruby/generate_readme.sh @@ -24,7 +24,14 @@ attrs = doc.attributes attrs['allow-uri-read'] = true puts attrs -out = "// Do not edit this file (e.g. go instead to src/main/asciidoc)\n\n" +out = <<-WARNING +//// +DO NOT EDIT THIS FILE. IT WAS GENERATED. +Manual changes to this file will be lost when it is generated again. +Edit the files in the src/main/asciidoc/ directory instead. +//// + +WARNING doc = Asciidoctor.load_file file, safe: :unsafe, parse: false, attributes: attrs out << doc.reader.read diff --git a/pom.xml b/pom.xml index f8d9bbaa..4eb4759a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,16 @@ - 4.0.0 org.springframework.cloud spring-cloud-build - 2.1.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT pom Spring Cloud Parent - Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects + Spring Cloud parent pom, managing plugins and dependencies for Spring + Cloud projects + docs spring-cloud-build-dependencies @@ -17,15 +20,16 @@ https://spring.io/spring-cloud 1.8 - @ + @ + UTF-8 UTF-8 ${java.version} ${java.version} ${basedir} ${project.artifactId} - 2.1.1.RELEASE - 2.1.0.BUILD-SNAPSHOT + 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT ${project.build.directory}/build-docs 0.1.0.RELEASE 0.1.0.RELEASE @@ -35,7 +39,8 @@ jacoco reuseReports - ${project.basedir}/../target/jacoco.exec + ${project.basedir}/../target/jacoco.exec + java @@ -66,6 +71,19 @@ 0.0.6 3.0.0 false + false + false + + false + + master + + + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml + + + ${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml + @@ -107,8 +125,11 @@ https://github.com/spring-cloud/spring-cloud-build - scm:git:git://github.com/spring-cloud/spring-cloud-build.git - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git + scm:git:git://github.com/spring-cloud/spring-cloud-build.git + + + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git + HEAD @@ -152,6 +173,16 @@ developer + + omaciaszeksharma + Olga Maciaszek-Sharma + omaciaszeksharma at pivotal.io + Pivotal Software, Inc. + http://www.spring.io + + developer + + @@ -244,7 +275,8 @@ ${start-class} - true + true + @@ -277,7 +309,8 @@ ${start-class} - true + true + @@ -301,6 +334,23 @@ false + + io.spring.javaformat + spring-javaformat-maven-plugin + ${spring-javaformat.version} + + + validate + + ${disable.checks} + + + apply + validate + + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -328,14 +378,24 @@ validate true + ${disable.checks} checkstyle.xml checkstyle-header.txt - checkstyle.build.directory=${project.build.directory} + + checkstyle.build.directory=${project.build.directory} + checkstyle.suppressions.file=${checkstyle.suppressions.file} + checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file} + true - false - false - false + + ${maven-checkstyle-plugin.includeTestSourceDirectory} + + ${maven-checkstyle-plugin.failsOnError} + + + ${maven-checkstyle-plugin.failOnViolation} + check @@ -343,23 +403,6 @@ - - io.spring.javaformat - spring-javaformat-maven-plugin - ${spring-javaformat.version} - - - validate - - ${disable.checks} - - - apply - validate - - - - pl.project13.maven git-commit-id-plugin @@ -375,7 +418,9 @@ true yyyy-MM-dd'T'HH:mm:ssZ true - ${project.build.outputDirectory}/git.properties + + ${project.build.outputDirectory}/git.properties + @@ -407,7 +452,8 @@ - true + true + true @@ -428,17 +474,22 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} @@ -503,7 +554,9 @@ https://github.com/spring-cloud spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + sonatype-nexus-staging @@ -599,7 +652,9 @@ bintray Jcenter Repository - https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} + + https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} + @@ -709,13 +764,17 @@ - org.springframework.cloud - spring-cloud-build-docs - ${spring-cloud-build.version} + org.springframework.cloud + + spring-cloud-build-docs + + ${spring-cloud-build.version} + sources jar false - ${docs.resources.dir} + ${docs.resources.dir} + @@ -869,7 +928,8 @@ - + @@ -890,7 +950,9 @@ - + @@ -905,27 +967,43 @@ true - - - + + + + override="true" + input="${version-type}" + regexp=".*\.(.*)" + replace="\1"/> + override="true" + input="${version-type}" + regexp="(M)\d+" + replace="MILESTONE"/> + override="true" + input="${version-type}" + regexp="(RC)\d+" + replace="MILESTONE"/> - + override="true" + input="${version-type}" + regexp="BUILD-(.*)" + replace="SNAPSHOT"/> + - - + + @@ -947,9 +1025,11 @@ docs - https://repo.spring.io + https://repo.spring.io + libs-release-local - libs-snapshots-local + libs-snapshots-local + diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index c0d9bee0..8e97bb66 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -1,23 +1,25 @@ - 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 2.1.0.BUILD-SNAPSHOT + 2.2.0.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. + 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. + org.springframework.boot spring-boot-dependencies - 2.1.1.RELEASE + 2.1.3.RELEASE UTF-8 - 2.1.1.RELEASE + 2.1.3.RELEASE @@ -38,8 +40,9 @@ https://github.com/spring-cloud spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - + + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + repo.spring.io @@ -69,7 +72,9 @@ bintray Jcenter Repository - https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} + + https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} + @@ -84,7 +89,8 @@ sonatype-nexus-staging Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 3c41191d..1110997b 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 org.springframework.cloud @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.1.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT @@ -20,5 +20,5 @@ ${puppycrawl-tools-checkstyle.version} - + diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml new file mode 100644 index 00000000..2c620df6 --- /dev/null +++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml index 977493ca..84b99566 100644 --- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml +++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml @@ -5,143 +5,164 @@ - + + + + + + - - + + + - + + + + + + + + + + + - + - - + + + value="false"/> - + - + - + - - + + - - - - - + + + + + - - - - - - - + + + + + + + - + - + - + - - + + + - - - - - + + + + + + + - + - - - - - + + + + + - + + - + + + - - - - + + - + - + - - - + + + - - + - + - + value="Line has leading space characters; indentation should be performed with tabs only."/> + - + - + value="Please use AssertJ imports."/> + - - - + + + - - - - + + + + - - - - - - - - - - - - + + + + + diff --git a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml index 37a8e928..fd29f619 100644 --- a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml +++ b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml @@ -1,6 +1,5 @@ - - + + \ No newline at end of file diff --git a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml index 84791f36..f86d1579 100644 --- a/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml +++ b/spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml @@ -1,12 +1,12 @@ - + -