From 5cb6250f7612371b94ce0eed9fde80ddd58d02a1 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 18:51:49 +0100
Subject: [PATCH 1/8] Apply spotless

Pretty much same scheme as in Maven project:
* check runs in build and will fail it if not properly formatted
* mvn spotless:apply to format (or -P format)
---
 .gitignore |   9 ++--
 pom.xml    | 133 +++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 105 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a78575..3cd5b79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 target/
-.project
 .classpath
-.settings/
-bin
+.project
+.settings
+*.iml
+.idea
+out/
+.DS_Store
diff --git a/pom.xml b/pom.xml
index c337213..e2ca078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
   <version>53-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Takari</name>
-  <url>http://takari.io</url>
   <description>Takari: The future of software delivery.</description>
+  <url>http://takari.io</url>
 
   <licenses>
     <license>
@@ -56,6 +56,13 @@
     </developer>
   </developers>
 
+  <scm>
+    <connection>scm:git:git@github.com:takari/takari-pom.git</connection>
+    <developerConnection>scm:git:git@github.com:takari/takari-pom.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>http://github.com/takari/takari-pom</url>
+  </scm>
+
   <distributionManagement>
     <repository>
       <id>sonatype.releases</id>
@@ -103,40 +110,7 @@
     <maven.compiler.target>${takari.javaSourceVersion}</maven.compiler.target>
   </properties>
 
-  <scm>
-    <connection>scm:git:git@github.com:takari/takari-pom.git</connection>
-    <developerConnection>scm:git:git@github.com:takari/takari-pom.git</developerConnection>
-    <url>http://github.com/takari/takari-pom</url>
-    <tag>HEAD</tag>
-  </scm>
-
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.6.3,)</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>io.takari.maven.plugins</groupId>
-        <artifactId>takari-lifecycle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <!-- set versions/configuration of common plugins for reproducibility, ordered alphabetically -->
@@ -324,6 +298,45 @@
             </mapping>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.43.0</version>
+          <configuration>
+            <java>
+              <!-- orders of used formatters are important MPOM-376 -->
+              <!-- eg. palantir override importOrder, so should be first -->
+              <palantirJavaFormat />
+              <removeUnusedImports />
+              <importOrder />
+            </java>
+            <pom>
+              <sortPom>
+                <expandEmptyElements>false</expandEmptyElements>
+                <!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
+                <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+              </sortPom>
+            </pom>
+            <upToDateChecking>
+              <enabled>true</enabled>
+            </upToDateChecking>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-shared-resources</artifactId>
+              <version>5</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <goals>
+                <goal>${spotless.action}</goal>
+              </goals>
+              <phase>process-sources</phase>
+            </execution>
+          </executions>
+        </plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
@@ -351,9 +364,61 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[3.6.3,)</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>io.takari.maven.plugins</groupId>
+        <artifactId>takari-lifecycle-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
 
   <profiles>
+    <profile>
+      <id>format-check</id>
+      <activation>
+        <property>
+          <name>!format</name>
+        </property>
+      </activation>
+      <properties>
+        <spotless.action>check</spotless.action>
+      </properties>
+    </profile>
+    <profile>
+      <id>format</id>
+      <activation>
+        <property>
+          <name>format</name>
+        </property>
+      </activation>
+      <properties>
+        <spotless.action>apply</spotless.action>
+      </properties>
+    </profile>
     <!-- START SNIPPET: release-profile -->
     <profile>
       <id>takari-release</id>

From 7bb6ae0dbc314a7b2c928177a4912a368805ef50 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 18:54:06 +0100
Subject: [PATCH 2/8] Move to Java 11 build time

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e62a71..607d1fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,4 +9,4 @@ jobs:
     name: Verify
     uses: takari/takari-gh-actions/.github/workflows/ci.yml@v2
     with:
-      jdk-matrix: '[ 8 ]' # for POM one JDK is enough
+      jdk-matrix: '[ 11 ]' # for POM one JDK is enough

From c5c4cc86d3d8619371fb11aca182af8b59b1b602 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 18:55:13 +0100
Subject: [PATCH 3/8] Adjust CI as well

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 607d1fb..01825bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,8 @@ name: Verify
 
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 jobs:

From 3c1faa8b3df8128e84d450dc4a5b34ed18043097 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 20:32:47 +0100
Subject: [PATCH 4/8] Require java

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index e2ca078..bcdab01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,6 +376,9 @@
             </goals>
             <configuration>
               <rules>
+                <requireJavaVersion>
+                  <version>[11,)</version>
+                </requireJavaVersion>
                 <requireMavenVersion>
                   <version>[3.6.3,)</version>
                 </requireMavenVersion>

From 7517252e712039660c1c443c3351e51bb7e55fbd Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 20:46:48 +0100
Subject: [PATCH 5/8] Drop unused

---
 pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index bcdab01..2cf2d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,13 +321,6 @@
               <enabled>true</enabled>
             </upToDateChecking>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-shared-resources</artifactId>
-              <version>5</version>
-            </dependency>
-          </dependencies>
           <executions>
             <execution>
               <goals>

From 254e8ba250dee41df10fc810ce1ab8e63795e840 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 21:01:36 +0100
Subject: [PATCH 6/8] Add dependabot

---
 .github/dependabot.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..2003740
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily

From 2b2e39d1ff5c38a82eca5d250d875218d4072bc6 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 21:06:42 +0100
Subject: [PATCH 7/8] Use new GH action

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 01825bd..01e4071 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,6 @@ on:
 jobs:
   build:
     name: Verify
-    uses: takari/takari-gh-actions/.github/workflows/ci.yml@v2
+    uses: takari/takari-gh-actions/.github/workflows/ci.yml@v3
     with:
       jdk-matrix: '[ 11 ]' # for POM one JDK is enough

From 4fe1080b9ca12468105e7b45b6a7b368d55e3580 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 9 Feb 2024 21:17:12 +0100
Subject: [PATCH 8/8] Update mycila config

---
 pom.xml | 59 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2cf2d63..4ccfb8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014 Takari, Inc.
+    Copyright (c) 2016 Takari, Inc.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
     which accompanies this distribution, and is available at
@@ -264,33 +264,38 @@
           <configuration>
             <aggregate>true</aggregate>
             <strictCheck>true</strictCheck>
-            <header>${takari.licenseHeader}</header>
             <useDefaultExcludes>false</useDefaultExcludes>
-            <includes>
-              <include>**/pom.xml</include>
-              <include>**/*.xml</include>
-              <include>**/*.xsd</include>
-              <include>**/*.xjb</include>
-              <include>**/*.mdo</include>
-              <include>**/*.properties</include>
-              <include>**/*.java</include>
-              <include>**/*.groovy</include>
-              <include>**/*.scala</include>
-              <include>**/*.aj</include>
-              <include>**/*.js</include>
-              <include>**/*.css</include>
-            </includes>
-            <excludes>
-              <exclude>**/target/**</exclude>
-              <exclude>**/conf/**</exclude>
-              <exclude>**/.*</exclude>
-              <exclude>**/pkg/**</exclude>
-              <exclude>**/.idea/**</exclude>
-              <exclude>**/release.properties</exclude>
-              <exclude>**/pom.xml.releaseBackup</exclude>
-              <exclude>release.sh</exclude>
-              <exclude>**/src/test/**</exclude>
-            </excludes>
+            <licenseSets>
+              <licenseSet>
+                <header>${takari.licenseHeader}</header>
+                <includes>
+                  <include>**/pom.xml</include>
+                  <include>**/*.xml</include>
+                  <include>**/*.xsd</include>
+                  <include>**/*.xjb</include>
+                  <include>**/*.mdo</include>
+                  <include>**/*.properties</include>
+                  <include>**/*.java</include>
+                  <include>**/*.groovy</include>
+                  <include>**/*.scala</include>
+                  <include>**/*.aj</include>
+                  <include>**/*.js</include>
+                  <include>**/*.css</include>
+                </includes>
+                <excludes>
+                  <exclude>.mvn/wrapper/**</exclude>
+                  <exclude>**/target/**</exclude>
+                  <exclude>**/conf/**</exclude>
+                  <exclude>**/.*</exclude>
+                  <exclude>**/pkg/**</exclude>
+                  <exclude>**/.idea/**</exclude>
+                  <exclude>**/release.properties</exclude>
+                  <exclude>**/pom.xml.releaseBackup</exclude>
+                  <exclude>release.sh</exclude>
+                  <exclude>**/src/test/**</exclude>
+                </excludes>
+              </licenseSet>
+            </licenseSets>
             <mapping>
               <scala>JAVADOC_STYLE</scala>
               <xjb>XML_STYLE</xjb>