From 0014504943e5d78f9201d2442f8bb780fd578959 Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Mon, 27 Jan 2025 12:58:36 +0000
Subject: [PATCH 1/2] Add automatic updating of README

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

diff --git a/pom.xml b/pom.xml
index 32f5777..784ff15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,18 @@
                         </archive>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>io.github.floverfelt</groupId>
+                    <artifactId>find-and-replace-maven-plugin</artifactId>
+                    <version>1.2.0</version>
+                    <configuration>
+                        <replacementType>file-contents</replacementType>
+                        <fileMask>.md</fileMask>
+                        <!-- Bit of hack as it is assuming this version is always 1.x -->
+                        <findRegex>&lt;version&gt;1.*&lt;/version&gt;</findRegex>
+                        <replaceValue>&lt;version&gt;${project.version}&lt;/version&gt;</replaceValue>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -61,6 +73,24 @@
             <id>release</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <version>2.5.3</version>
+                        <configuration>
+                            <preparationGoals>-Prelease clean find-and-replace:find-and-replace scm:checkin verify</preparationGoals>
+                            <completionGoals>-Prelease clean verify</completionGoals>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-scm-plugin</artifactId>
+                        <version>2.1.0</version>
+                        <configuration>
+                            <message>[maven-scm-plugin] Set ${project.version} version in README.md</message>
+                            <includes>README.md</includes>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>

From 0d64b0f35f965eca8086e2dd63b4fc073ed58e0d Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Mon, 3 Feb 2025 16:55:27 +0000
Subject: [PATCH 2/2] Simplify update. Add java-import-order note

---
 README.md | 8 ++++++--
 pom.xml   | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index cf24220..35e0b60 100644
--- a/README.md
+++ b/README.md
@@ -95,10 +95,14 @@ Note that configuration for `impsort-maven-plugin` has also been added as its a
 A typical pom could contain:
 
 ```
+<properties
+   <spotless-maven-plugin.version>2.44.2</spotless-maven-plugin.version>
+</properties>
+
 <plugin>
   <groupId>com.diffplug.spotless</groupId>
   <artifactId>spotless-maven-plugin</artifactId>
-  <version>2.44.2</version>
+  <version>${spotless-maven-plugin.version}</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.pnc</groupId>
@@ -110,7 +114,7 @@ A typical pom could contain:
     <java>
       <removeUnusedImports/>
       <importOrder>
-        <order>java,javax,jakarta,org,com</order>
+        <file>java-import-order.txt</file>
       </importOrder>
       <eclipse>
         <file>java-formatter.xml</file>
diff --git a/pom.xml b/pom.xml
index 784ff15..0be6c2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,8 @@
                     <version>1.2.0</version>
                     <configuration>
                         <replacementType>file-contents</replacementType>
-                        <fileMask>.md</fileMask>
-                        <!-- Bit of hack as it is assuming this version is always 1.x -->
-                        <findRegex>&lt;version&gt;1.*&lt;/version&gt;</findRegex>
+                        <fileMask>.md</fileMask>d
+                        <findRegex>&lt;version&gt;[0-9].*&lt;/version&gt;</findRegex>
                         <replaceValue>&lt;version&gt;${project.version}&lt;/version&gt;</replaceValue>
                     </configuration>
                 </plugin>