From 115df72f8a6803c995aa46aa18ab14bf2c2ddedd Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sat, 18 Feb 2023 17:09:11 +0100
Subject: [PATCH] Bump parent from 72 to 73

- execute spotless by JDK 11
- add missing import for groovy XmlSlurper in ITs
---
 pom.xml                                       | 61 ++++++++++++-------
 versions-maven-plugin/pom.xml                 |  2 +-
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../it-force-releases-issue-134/verify.groovy |  2 +
 .../it/it-lock-snapshots-junit/verify.groovy  |  2 +
 .../verify.groovy                             |  2 +
 .../it/it-use-dep-version-001/verify.groovy   |  1 +
 .../it/it-use-dep-version-002/verify.groovy   |  1 +
 .../it/it-use-dep-version-003/verify.groovy   |  2 +
 .../it/it-use-dep-version-004/verify.groovy   |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../it-use-latest-versions-009/verify.groovy  |  2 +
 .../it-use-latest-versions-010/verify.groovy  |  2 +
 .../it-use-latest-versions-011/verify.groovy  |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../verify.groovy                             |  2 +
 .../it-use-releases-issue-134/verify.groovy   |  2 +
 .../verify.groovy                             |  2 +
 27 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index ea9d1135e..c8027c1dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo</groupId>
     <artifactId>mojo-parent</artifactId>
-    <version>72</version>
+    <version>73</version>
   </parent>
 
   <groupId>org.codehaus.mojo.versions</groupId>
@@ -107,7 +107,7 @@
   <scm>
     <connection>scm:git:https://github.com/mojohaus/versions.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mojohaus/versions.git</developerConnection>
-    <tag>2.14.2</tag>
+    <tag>HEAD</tag>
     <url>https://github.com/mojohaus/versions/tree/master</url>
   </scm>
 
@@ -122,10 +122,13 @@
   </ciManagement>
 
   <properties>
-    <mojo.java.target>1.8</mojo.java.target>
-    <maven.compiler.source>${mojo.java.target}</maven.compiler.source>
+    <mojo.java.target>8</mojo.java.target>
+
+    <!-- some of plugins requires JDK 11 -->
+    <recommendedJavaBuildVersion>11</recommendedJavaBuildVersion>
+
     <junitBomVersion>5.9.1</junitBomVersion>
-    <mavenVersion>3.2.5</mavenVersion>
+    <maven.version>3.2.5</maven.version>
     <doxiaVersion>1.12.0</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
     <pluginVersion>${project.version}</pluginVersion>
@@ -145,37 +148,37 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-compat</artifactId>
-        <version>${mavenVersion}</version>
+        <version>${maven.version}</version>
       </dependency>
 
       <dependency>
@@ -313,17 +316,6 @@
   <build>
 
     <plugins>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>${checkstyle.spotless.config}</configLocation>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -377,4 +369,29 @@
     </plugins>
   </reporting>
 
+  <profiles>
+    <profile>
+      <id>java11+</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+
+      <build>
+        <!--- newer versions of plugins requires JDK 11 -->
+        <plugins>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <configuration>
+              <configLocation>${checkstyle.spotless.config}</configLocation>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
index 78bfb61f1..b978589ed 100644
--- a/versions-maven-plugin/pom.xml
+++ b/versions-maven-plugin/pom.xml
@@ -16,7 +16,7 @@
   <description>The Versions Maven Plugin is used when you want to manage the versions of artifacts in a project's POM.</description>
 
   <prerequisites>
-    <maven>${mavenVersion}</maven>
+    <maven>${maven.version}</maven>
   </prerequisites>
 
   <dependencies>
diff --git a/versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.groovy b/versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.groovy
index abe5e2419..7561bb5ce 100644
--- a/versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
 assert changes.dependencyUpdate.find { node -> node.@kind == 'parent-update'
     && node.@groupId == 'localhost'
diff --git a/versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.groovy b/versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.groovy
index 3dc23878f..e78e957ef 100644
--- a/versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
 assert changes.dependencyUpdate.find { node -> node.@kind == 'property-update'
         && node.@groupId == 'localhost'
diff --git a/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.groovy b/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.groovy
index 01818e5e4..b934b36ab 100644
--- a/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
 assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
         && node.@groupId == 'localhost'
diff --git a/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.groovy b/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.groovy
index 453159521..4bd003e9f 100644
--- a/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
 assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
         && node.@groupId == 'localhost'
diff --git a/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.groovy b/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.groovy
index 01818e5e4..b934b36ab 100644
--- a/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
 assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
         && node.@groupId == 'localhost'
diff --git a/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.groovy b/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.groovy
index a8c089398..88d03acd9 100644
--- a/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def changes = new XmlSlurper().parse( new File( basedir, 'target/versions-changes.xml' ) )
 assert changes.dependencyUpdate.find { node -> node.@kind == 'dependency-update'
         && node.@groupId == 'localhost'
diff --git a/versions-maven-plugin/src/it/it-compare-dependencies-issue-289/verify.groovy b/versions-maven-plugin/src/it/it-compare-dependencies-issue-289/verify.groovy
index 3271a1899..1f92eb69a 100644
--- a/versions-maven-plugin/src/it/it-compare-dependencies-issue-289/verify.groovy
+++ b/versions-maven-plugin/src/it/it-compare-dependencies-issue-289/verify.groovy
@@ -1,2 +1,4 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.parent.version == '2.0'
diff --git a/versions-maven-plugin/src/it/it-force-releases-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-force-releases-issue-134/verify.groovy
index 3dd9dee67..d3e03f554 100644
--- a/versions-maven-plugin/src/it/it-force-releases-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-force-releases-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-lock-snapshots-junit/verify.groovy b/versions-maven-plugin/src/it/it-lock-snapshots-junit/verify.groovy
index ee5b13808..a98dba8fa 100644
--- a/versions-maven-plugin/src/it/it-lock-snapshots-junit/verify.groovy
+++ b/versions-maven-plugin/src/it/it-lock-snapshots-junit/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert !( project.dependencies.dependency.version =~ /-SNAPSHOT/ )
\ No newline at end of file
diff --git a/versions-maven-plugin/src/it/it-unlock-snapshots-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-unlock-snapshots-issue-134/verify.groovy
index 08dd0bfdf..64c53c648 100644
--- a/versions-maven-plugin/src/it/it-unlock-snapshots-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-unlock-snapshots-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-use-dep-version-001/verify.groovy b/versions-maven-plugin/src/it/it-use-dep-version-001/verify.groovy
index e0c7f6eb4..9e12c153d 100644
--- a/versions-maven-plugin/src/it/it-use-dep-version-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-dep-version-001/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlSlurper
 
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.dependencies.dependency.version == '1.0.1'
diff --git a/versions-maven-plugin/src/it/it-use-dep-version-002/verify.groovy b/versions-maven-plugin/src/it/it-use-dep-version-002/verify.groovy
index 4f3efccf2..21d7ca52b 100644
--- a/versions-maven-plugin/src/it/it-use-dep-version-002/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-dep-version-002/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlSlurper
 
 def parent = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert parent.dependencies.dependency.version == '1.0.1'
diff --git a/versions-maven-plugin/src/it/it-use-dep-version-003/verify.groovy b/versions-maven-plugin/src/it/it-use-dep-version-003/verify.groovy
index 5c8f82d14..42875b9c8 100644
--- a/versions-maven-plugin/src/it/it-use-dep-version-003/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-dep-version-003/verify.groovy
@@ -17,5 +17,7 @@
  * under the License.
  */
 
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.profiles.profile.dependencies.dependency.version == '1.0.1'
diff --git a/versions-maven-plugin/src/it/it-use-dep-version-004/verify.groovy b/versions-maven-plugin/src/it/it-use-dep-version-004/verify.groovy
index f5eb90562..19f60770c 100644
--- a/versions-maven-plugin/src/it/it-use-dep-version-004/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-dep-version-004/verify.groovy
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlSlurper
+
 
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.properties.revision == '1.0.1'
diff --git a/versions-maven-plugin/src/it/it-use-dep-version-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-dep-version-issue-134/verify.groovy
index b45ebad17..145fb045b 100644
--- a/versions-maven-plugin/src/it/it-use-dep-version-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-dep-version-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-use-latest-releases-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-latest-releases-issue-134/verify.groovy
index b45ebad17..145fb045b 100644
--- a/versions-maven-plugin/src/it/it-use-latest-releases-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-latest-releases-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-use-latest-snapshots-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-latest-snapshots-issue-134/verify.groovy
index b3f3e21cb..0b31e37df 100644
--- a/versions-maven-plugin/src/it/it-use-latest-snapshots-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-latest-snapshots-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-use-latest-versions-009/verify.groovy b/versions-maven-plugin/src/it/it-use-latest-versions-009/verify.groovy
index 954f1b214..813b41b06 100644
--- a/versions-maven-plugin/src/it/it-use-latest-versions-009/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-latest-versions-009/verify.groovy
@@ -1,2 +1,4 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.parent.version == '3.0'
diff --git a/versions-maven-plugin/src/it/it-use-latest-versions-010/verify.groovy b/versions-maven-plugin/src/it/it-use-latest-versions-010/verify.groovy
index 954f1b214..813b41b06 100644
--- a/versions-maven-plugin/src/it/it-use-latest-versions-010/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-latest-versions-010/verify.groovy
@@ -1,2 +1,4 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.parent.version == '3.0'
diff --git a/versions-maven-plugin/src/it/it-use-latest-versions-011/verify.groovy b/versions-maven-plugin/src/it/it-use-latest-versions-011/verify.groovy
index 09e552dd5..9bde59807 100644
--- a/versions-maven-plugin/src/it/it-use-latest-versions-011/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-latest-versions-011/verify.groovy
@@ -1,2 +1,4 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 assert project.parent.version == '1.0.0'
diff --git a/versions-maven-plugin/src/it/it-use-latest-versions-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-latest-versions-issue-134/verify.groovy
index b45ebad17..145fb045b 100644
--- a/versions-maven-plugin/src/it/it-use-latest-versions-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-latest-versions-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-use-next-releases-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-next-releases-issue-134/verify.groovy
index 6bbc4ba6a..b1d6a06fc 100644
--- a/versions-maven-plugin/src/it/it-use-next-releases-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-next-releases-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-use-next-snapshots-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-next-snapshots-issue-134/verify.groovy
index 080a7ed85..0d1ebc9c7 100644
--- a/versions-maven-plugin/src/it/it-use-next-snapshots-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-next-snapshots-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper()
         .parse( new File( basedir, 'pom.xml' ) )
 
diff --git a/versions-maven-plugin/src/it/it-use-releases-issue-134/verify.groovy b/versions-maven-plugin/src/it/it-use-releases-issue-134/verify.groovy
index 3dd9dee67..d3e03f554 100644
--- a/versions-maven-plugin/src/it/it-use-releases-issue-134/verify.groovy
+++ b/versions-maven-plugin/src/it/it-use-releases-issue-134/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def project = new XmlSlurper().parse( new File( basedir, 'pom.xml' ) )
 
 assert project.dependencyManagement.dependencies.'*'.size() == 1
diff --git a/versions-maven-plugin/src/it/it-xml-property-updates-report-001/verify.groovy b/versions-maven-plugin/src/it/it-xml-property-updates-report-001/verify.groovy
index dcaae2249..c51ee5f3c 100644
--- a/versions-maven-plugin/src/it/it-xml-property-updates-report-001/verify.groovy
+++ b/versions-maven-plugin/src/it/it-xml-property-updates-report-001/verify.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 def pom = new XmlSlurper()
         .parse( new File( basedir, 'target/property-updates-report.xml' ) )