diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml index edc238d..bf32c9a 100644 --- a/parent_toplevel/changes.xml +++ b/parent_toplevel/changes.xml @@ -24,7 +24,10 @@ xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd"> - + + + Apply automatic Spotless formatting for Java and POM files. + Update global-parent dependency to 76. diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml index c1fa33b..88b3f9f 100644 --- a/parent_toplevel/pom.xml +++ b/parent_toplevel/pom.xml @@ -18,7 +18,6 @@ limitations under the License. #L% --> - 4.0.0 @@ -31,7 +30,7 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom Toplevel Parent @@ -41,8 +40,8 @@ scm:git:https://github.com/wcm-io-devops/devops-tooling.git scm:git:https://github.com/wcm-io-devops/devops-tooling.git - https://github.com/wcm-io-devops/devops-tooling HEAD + https://github.com/wcm-io-devops/devops-tooling 2015 @@ -185,10 +184,10 @@ license-maven-plugin - validate check-file-header + validate @@ -211,6 +210,11 @@ org.apache.maven.plugins maven-site-plugin + + true + UTF-8 + UTF-8 + io.wcm.maven.skins @@ -218,11 +222,6 @@ 1.1.0 - - true - UTF-8 - UTF-8 - attach-descriptor @@ -233,6 +232,56 @@ + + com.diffplug.spotless + spotless-maven-plugin + 3.3.0 + + + + global-build-tools/eclipse/java-formatter.xml + + + + global-build-tools/spotless/header-java.txt + + + + PRESERVE + + + global-build-tools/spotless/header-xml.txt + <project + + + global-build-tools/spotless/sortpom.xml + 2 + false + + true + + + + true + + + + + io.wcm.maven + io.wcm.maven.global-build-tools + 36-SNAPSHOT + + + + + + ${spotless.action} + + process-sources + + + + @@ -257,10 +306,10 @@ generate-file - site write + site @@ -375,6 +424,7 @@ + release-profile @@ -394,10 +444,10 @@ sign-artifacts - verify sign + verify @@ -405,8 +455,8 @@ org.sonatype.central central-publishing-maven-plugin - true true + true sonatype-central ${project.artifactId} ${project.version} @@ -415,6 +465,32 @@ + + + + spotless-format-check + + + env.CI + + + + check + + + + + format + + + !env.CI + + + + apply + + + diff --git a/pom.xml b/pom.xml index fedc644..01b5d21 100644 --- a/pom.xml +++ b/pom.xml @@ -18,15 +18,13 @@ limitations under the License. #L% --> - - + 4.0.0 io.wcm.devops io.wcm.devops.parent_toplevel - 2.1.2 + 2.2.0-SNAPSHOT parent_toplevel/pom.xml diff --git a/public_site/pom.xml b/public_site/pom.xml index 04a299d..8ca1c04 100644 --- a/public_site/pom.xml +++ b/public_site/pom.xml @@ -18,15 +18,13 @@ limitations under the License. #L% --> - - + 4.0.0 io.wcm.devops io.wcm.devops.parent_toplevel - 2.1.2 + 2.2.0-SNAPSHOT ../parent_toplevel/pom.xml @@ -42,8 +40,8 @@ scm:git:https://github.com/wcm-io-devops/devops-tooling.git scm:git:https://github.com/wcm-io-devops/devops-tooling.git - https://github.com/wcm-io-devops/devops-tooling HEAD + https://github.com/wcm-io-devops/devops-tooling