Update plugins

make sure maven-plugin-tools-x are installed for ITs
apache · Apr 23, 2021 · f727d26 · f727d26
1 parent 129217b
commit f727d26
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
@@ -83,6 +83,19 @@
         'maven-plugin-tools-annotations' which fails to load at runtime when not available.
       -->
     </dependency>
+    <!-- define optional runtime dependencies for integration tests -->
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-ant</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-beanshell</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
 
     <!-- doxia -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -95,9 +95,9 @@
     <pluginTestingHarnessVersion>1.3</pluginTestingHarnessVersion>
     <mavenVersion>3.0</mavenVersion>
     <antVersion>1.7.1</antVersion>
-    <mavenInvokerPluginVersion>3.0.1</mavenInvokerPluginVersion>
+    <mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
     <maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
-    <asmVersion>9.0</asmVersion>
+    <asmVersion>9.1</asmVersion>
     <project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
   </properties>
 
@@ -134,6 +134,11 @@
         <artifactId>maven-plugin-annotations</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-tools-ant</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-beanshell</artifactId>
@@ -196,12 +201,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-velocity</artifactId>
         <version>1.2</version>
-        <exclusions>
-          <exclusion>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
 
       <!-- other -->
@@ -243,7 +242,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.13</version>
+        <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -263,7 +262,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.9.0</version>
+          <version>3.9.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -291,26 +290,12 @@
     <plugins>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-bytecode-version</id>
-            <configuration>
-              <rules>
-                <enforceBytecodeVersion>
-                  <excludes>
-                    <!-- ASM supports Java 1.5+, see https://asm.ow2.io/faq.html#Q14 -->
-                    <exclude>org.ow2.asm:*</exclude>
-                  </excludes>
-                </enforceBytecodeVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
+        <version>3.0.0-M3</version>
         <dependencies>
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.2</version>
+            <version>1.3</version>
           </dependency>
         </dependencies>
       </plugin>