Bump org.codehaus.mojo:mojo-parent from 85 to 86 (#1139)

* Bump org.codehaus.mojo:mojo-parent from 85 to 86 Bumps [org.codehaus.mojo:mojo-parent](https://github.com/mojohaus/mojo-parent) from 85 to 86. - [Release notes](https://github.com/mojohaus/mojo-parent/releases) - [Commits](https://github.com/mojohaus/mojo-parent/commits) --- updated-dependencies: - dependency-name: org.codehaus.mojo:mojo-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fix build with new parent --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Slawomir Jaranowski <s.jaranowski@gmail.com>
mojohaus · Oct 11, 2024 · 1916d74 · 1916d74
1 parent 9197125
commit 1916d74
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo</groupId>
     <artifactId>mojo-parent</artifactId>
-    <version>85</version>
+    <version>86</version>
   </parent>
 
   <groupId>org.codehaus.mojo.versions</groupId>
@@ -123,9 +123,11 @@
     <doxiaVersion>1.12.0</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
     <mockitoVersion>4.11.0</mockitoVersion>
+
+    <!-- dotted property can not be used in .vm -->
     <pluginVersion>${project.version}</pluginVersion>
     <sitePluginVersion>${maven-site-plugin.version}</sitePluginVersion>
-    <!-- dotted property can not be used in .vm -->
+    <sisuMavenPluginVersion>${sisu-maven-plugin.version}</sisuMavenPluginVersion>
     <fluidoVersion>${maven-fluido-skin.version}</fluidoVersion>
     <modelloNamespaceRuleVersion>2.1.0</modelloNamespaceRuleVersion>
     <modelloNamespaceReportVersion>2.0.0</modelloNamespaceReportVersion>

diff --git a/versions-api/src/site/markdown/index.md.vm b/versions-api/src/site/markdown/index.md.vm
@@ -27,7 +27,7 @@ Your Maven project should look like:
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
       <artifactId>versions-api</artifactId>
-      <version>${project.version}</version>
+      <version>${pluginVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -44,7 +44,7 @@ Your Maven project should look like:
         <!-- build index of JSR 330 components -->
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
-        <version>${sisu-maven-plugin-version}</version>
+        <version>${sisuMavenPluginVersion}</version>
         <executions>
           <execution>
             <id>generate-index</id>
@@ -89,7 +89,7 @@ You need to add your extension as plugin dependency:
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>versions-maven-plugin</artifactId>
-          <version>${project.version}</version>
+          <version>${pluginVersion}</version>
           <dependencies>
             <dependency>
               <!-- add your extension as plugin dependency -->

diff --git a/versions-enforcer/pom.xml b/versions-enforcer/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <!-- used in documentations -->
-    <maven-enforcer-plugin-version>${maven-enforcer-plugin.version}</maven-enforcer-plugin-version>
+    <mavenEnforcerPluginVersion>${maven-enforcer-plugin.version}</mavenEnforcerPluginVersion>
   </properties>
 
   <dependencies>

diff --git a/versions-enforcer/src/site/markdown/index.md.vm b/versions-enforcer/src/site/markdown/index.md.vm
@@ -84,7 +84,7 @@ It will also ignore all sub-incremental updates.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven-enforcer-plugin-version}</version>
+                <version>${mavenEnforcerPluginVersion}</version>
                 <goals>
                     <goal>enforce</goal>
                 </goals>

diff --git a/versions-maven-plugin/src/it/it-set-008/verify.groovy b/versions-maven-plugin/src/it/it-set-008/verify.groovy
@@ -1,4 +1,3 @@
-import org.apache.commons.lang.StringUtils
 
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.xpath.XPathFactory
@@ -37,7 +36,7 @@ class Checker
       try
       {
         def actual = readXPath( pom, xpath )
-        if ( !StringUtils.equals( expected, actual ) )
+        if ( !Objects.equals( expected, actual ) )
         {
           System.out.println( pom + " [xpath:" + xpath + "] expected '" + expected + "' found '" + actual + "' : " + message );
           result = false;

diff --git a/versions-maven-plugin/src/it/it-set-009/verify.groovy b/versions-maven-plugin/src/it/it-set-009/verify.groovy
@@ -1,4 +1,3 @@
-import org.apache.commons.lang.StringUtils
 
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.xpath.XPathFactory
@@ -36,7 +35,7 @@ class Checker
             try
             {
                 def actual = readXPath( pom, xpath )
-                if ( !StringUtils.equals( expected, actual ) )
+                if ( !Objects.equals( expected, actual ) )
                 {
                     System.out.println( pom + " [xpath:" + xpath + "] expected '" + expected + "' found '" + actual + "' : " + message );
                     result = false;

diff --git a/versions-maven-plugin/src/it/it-set-010-issue-198/verify.groovy b/versions-maven-plugin/src/it/it-set-010-issue-198/verify.groovy
@@ -1,4 +1,3 @@
-import org.apache.commons.lang.StringUtils
 
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.xpath.XPathFactory
@@ -36,7 +35,7 @@ class Checker
             try
             {
                 def actual = readXPath( pom, xpath )
-                if ( !StringUtils.equals( expected, actual ) )
+                if ( !Objects.equals( expected, actual ) )
                 {
                     System.out.println( pom + " [xpath:" + xpath + "] expected '" + expected + "' found '" + actual + "' : " + message );
                     result = false;

diff --git a/versions-maven-plugin/src/it/it-set-018-issue-82/verify.groovy b/versions-maven-plugin/src/it/it-set-018-issue-82/verify.groovy
@@ -1,4 +1,3 @@
-import org.apache.commons.lang.StringUtils
 
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.xpath.XPathFactory
@@ -37,7 +36,7 @@ class Checker
       try
       {
         def actual = readXPath( pom, xpath )
-        if ( !StringUtils.equals( expected, actual ) )
+        if ( !Objects.equals( expected, actual ) )
         {
           System.out.println( pom + " [xpath:" + xpath + "] expected '" + expected + "' found '" + actual + "' : " + message );
           result = false;

diff --git a/versions-maven-plugin/src/it/it-set-019-issue-426/verify.groovy b/versions-maven-plugin/src/it/it-set-019-issue-426/verify.groovy
@@ -1,4 +1,3 @@
-import org.apache.commons.lang.StringUtils
 
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.xpath.XPathFactory
@@ -37,7 +36,7 @@ class Checker
       try
       {
         def actual = readXPath( pom, xpath )
-        if ( !StringUtils.equals( expected, actual ) )
+        if ( !Objects.equals( expected, actual ) )
         {
           System.out.println( pom + " [xpath:" + xpath + "] expected '" + expected + "' found '" + actual + "' : " + message );
           result = false;