Skip to content

Commit

Permalink
Fixed the boot checkstyle and formatter setup
Browse files Browse the repository at this point in the history
  • Loading branch information
marcingrzejszczak committed Oct 1, 2018
1 parent b14b53f commit 542f540
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 12 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root=true

[*.java]
indent_style = tab
indent_size = 4
continuation_indent_size = 8

[*.groovy]
indent_style = tab
indent_size = 4
continuation_indent_size = 8

[*.xml]
indent_style = tab
indent_size = 4
continuation_indent_size = 8
Empty file added .springformat
Empty file.
34 changes: 22 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!-- Plugins -->
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<checkstyle.version>3.0.0</checkstyle.version>
<checkstyle.version>8.12</checkstyle.version>
<puppycrawl-tools-checkstyle.version>8.12</puppycrawl-tools-checkstyle.version>
<spring-javaformat.version>0.0.6</spring-javaformat.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
Expand All @@ -58,6 +58,8 @@
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
<license-maven-plugin.version>1.16</license-maven-plugin.version>
<spring-javaformat-checkstyle.version>0.0.6</spring-javaformat-checkstyle.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -297,24 +299,32 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.version}</version>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-tools</artifactId>
<version>${spring-cloud-build.version}</version>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
<dependency>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-checkstyle</artifactId>
<version>${spring-javaformat-checkstyle.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<headerLocation>LICENSE.txt</headerLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<executions>
<execution>
<id>validate</id>
<id>checkstyle-validation</id>
<phase>validate</phase>
<inherited>true</inherited>
<configuration>
<configLocation>io/spring/javaformat/checkstyle/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<!-- TODO: Start fixing the errors -->
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failsOnError>false</failsOnError>
<failOnViolation>false</failOnViolation>
</configuration>
<goals>
<goal>check</goal>
</goals>
Expand Down

0 comments on commit 542f540

Please sign in to comment.