[MPLUGIN-485] Upgrade Parent to 40

apache · Oct 21, 2023 · 1934c85 · 1934c85
1 parent 52cf6b5
commit 1934c85
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 17 deletions.
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
@@ -284,6 +284,13 @@
                 <pomExclude>plugin-info-jdk/pom.xml</pomExclude>
                 <!-- relies on just a given plugin.xml for generating a report, this is no longer supported -->
               </pomExcludes>
+              <extraArtifacts>
+                <!-- used in ITs -->
+                <extraArtifact>org.apache.maven.plugin-tools:maven-plugin-tools-annotations:${project.version}:jar:test-sources</extraArtifact>
+                <extraArtifact>org.apache.maven.plugin-tools:maven-plugin-tools-annotations:${project.version}:test-jar</extraArtifact>
+                <extraArtifact>org.apache.maven.plugin-tools:maven-script-ant:${project.version}</extraArtifact>
+                <extraArtifact>org.apache.maven.plugin-tools:maven-script-beanshell:${project.version}</extraArtifact>
+              </extraArtifacts>
             </configuration>
             <executions>
               <execution>

diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File touchFile = new File( basedir, "module-mojo/target/touch.txt" )
 assert touchFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy b/maven-plugin-plugin/src/it/annotation-with-inheritance/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File touchFile = new File( basedir, "target/touch.txt" )
 assert touchFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File touchFile = new File( basedir, "target/touch.txt" )
 assert touchFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File touchFile = new File( basedir, "target/touch.txt" )
 assert touchFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File touchFile = new File( basedir, "target/touch.txt" )
 assert touchFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/java-basic/verify.groovy b/maven-plugin-plugin/src/it/java-basic/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File touchFile = new File( basedir, "target/touch.txt" )
 assert touchFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/mplugin-223/verify.groovy b/maven-plugin-plugin/src/it/mplugin-223/verify.groovy
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/verify.groovy
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/verify.groovy
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/verify.groovy
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/verify.groovy b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/packaging-jar/verify.groovy b/maven-plugin-plugin/src/it/packaging-jar/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-plugin/src/it/source-encoding/verify.groovy b/maven-plugin-plugin/src/it/source-encoding/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 def latin1File = new File(basedir, 'latin-1/target/classes/META-INF/maven/plugin.xml')
 assert latin1File.exists()
 def latin1Chars = new XmlParser().parse(latin1File).mojos.mojo.description.text()

diff --git a/maven-plugin-plugin/src/it/v4api/verify.groovy b/maven-plugin-plugin/src/it/v4api/verify.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import groovy.xml.XmlParser
+
 File descriptorFile = new File( basedir, "target/classes/META-INF/maven/plugin.xml" );
 assert descriptorFile.isFile()
 

diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
@@ -257,6 +257,10 @@
                 <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
                 <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
               </properties>
+              <extraArtifacts>
+                <!-- used in ITs -->
+                <extraArtifact>org.apache.maven.plugins:maven-plugin-plugin:${project.version}</extraArtifact>
+              </extraArtifacts>
             </configuration>
             <executions>
               <execution>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>39</version>
+    <version>40</version>
     <relativePath />
   </parent>
 
@@ -357,24 +357,22 @@
             <trimStackTrace>false</trimStackTrace>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <configuration>
+            <java>
+              <includes>
+                <include>src/**/*.java</include>
+              </includes>
+              <excludes>
+                <exclude>**/it/source-encoding/</exclude>
+              </excludes>
+            </java>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <configuration>
-          <java>
-            <includes>
-              <include>src/**/*.java</include>
-            </includes>
-            <excludes>
-              <exclude>**/it/source-encoding/</exclude>
-            </excludes>
-          </java>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 
   <profiles>