diff --git a/CHANGELOG.md b/CHANGELOG.md index f41fc48..08b0703 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ can be incremented even for breaking changes. ### Changed +- Replace git-code-format-maven-plugin by spotless-maven-plugin (#54). - Bump minimum required maven version from 2.8.6 to 2.8.7 (#62). - Bump spring-boot-starter-parent from 3.0.0 to 3.0.3 (#57, #59, #60). diff --git a/README.md b/README.md index 09f3889..74369c2 100644 --- a/README.md +++ b/README.md @@ -67,10 +67,8 @@ in your project: mvn help:effective-pom ``` -Note that despite the code target (`this.java.version`) can be Java 8, you will have to -use at least Java 11 to build it (because maven-git-code-format dropped Java 8 support -since version 3.x). You must also declare a -[`maven-versions-rules.xml`](/maven-versions-rules.xml) file at the root of your project. +You must also declare a [`maven-versions-rules.xml`](/maven-versions-rules.xml) file at the root of +your project. ## What's included? @@ -107,8 +105,8 @@ since version 3.x). You must also declare a [maven-release-plugin](https://maven.apache.org/maven-release/maven-release-plugin/) (change `tagNameFormat`). - plugin management for - [maven-git-code-format](https://github.com/Cosium/maven-git-code-format) - (hooks installation), + [spotless-maven-plugin](https://github.com/diffplug/spotless/blob/main/plugin-maven/README.md) + (binding to the verify phase), - plugin management and project configuration for [sonar-maven-plugin](https://sonarsource.github.io/sonar-scanner-maven/), - plugin management and project configuration for diff --git a/pom.xml b/pom.xml index d826f6c..0dd2b58 100644 --- a/pom.xml +++ b/pom.xml @@ -122,13 +122,13 @@ 1.3.0 - 4.2 3.0.1 2.5.3 3.12.1 0.8.8 3.3.1 3.9.1.2184 + 2.33.0 ${this.java.version} @@ -228,40 +228,6 @@ - - - com.cosium.code - git-code-format-maven-plugin - ${git-code-format-maven-plugin.version} - - - - install-formatter-hook - - install-hooks - - - - - validate-code-format - - validate-code-format - - - - - - - com.cosium.code - google-java-format - ${git-code-format-maven-plugin.version} - - - - maven-release-plugin ${maven-release-plugin.version} @@ -281,6 +247,20 @@ ${sonar-maven-plugin.version} + + com.diffplug.spotless + spotless-maven-plugin + ${spotless-maven-plugin.version} + + + + + check + + + + + org.codehaus.mojo