Skip to content

Commit f727d26

Browse files
committedApr 23, 2021
Update plugins
make sure maven-plugin-tools-x are installed for ITs
1 parent 129217b commit f727d26

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed
 

‎maven-plugin-plugin/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,19 @@
8383
'maven-plugin-tools-annotations' which fails to load at runtime when not available.
8484
-->
8585
</dependency>
86+
<!-- define optional runtime dependencies for integration tests -->
87+
<dependency>
88+
<groupId>org.apache.maven.plugin-tools</groupId>
89+
<artifactId>maven-plugin-tools-ant</artifactId>
90+
<scope>runtime</scope>
91+
<optional>true</optional>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.maven.plugin-tools</groupId>
95+
<artifactId>maven-plugin-tools-beanshell</artifactId>
96+
<scope>runtime</scope>
97+
<optional>true</optional>
98+
</dependency>
8699

87100
<!-- doxia -->
88101
<dependency>

‎pom.xml

+11-26
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
<pluginTestingHarnessVersion>1.3</pluginTestingHarnessVersion>
9696
<mavenVersion>3.0</mavenVersion>
9797
<antVersion>1.7.1</antVersion>
98-
<mavenInvokerPluginVersion>3.0.1</mavenInvokerPluginVersion>
98+
<mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
9999
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
100-
<asmVersion>9.0</asmVersion>
100+
<asmVersion>9.1</asmVersion>
101101
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
102102
</properties>
103103

@@ -134,6 +134,11 @@
134134
<artifactId>maven-plugin-annotations</artifactId>
135135
<version>${project.version}</version>
136136
</dependency>
137+
<dependency>
138+
<groupId>org.apache.maven.plugin-tools</groupId>
139+
<artifactId>maven-plugin-tools-ant</artifactId>
140+
<version>${project.version}</version>
141+
</dependency>
137142
<dependency>
138143
<groupId>org.apache.maven.plugin-tools</groupId>
139144
<artifactId>maven-plugin-tools-beanshell</artifactId>
@@ -196,12 +201,6 @@
196201
<groupId>org.codehaus.plexus</groupId>
197202
<artifactId>plexus-velocity</artifactId>
198203
<version>1.2</version>
199-
<exclusions>
200-
<exclusion>
201-
<groupId>velocity</groupId>
202-
<artifactId>velocity</artifactId>
203-
</exclusion>
204-
</exclusions>
205204
</dependency>
206205

207206
<!-- other -->
@@ -243,7 +242,7 @@
243242
<dependency>
244243
<groupId>junit</groupId>
245244
<artifactId>junit</artifactId>
246-
<version>4.13</version>
245+
<version>4.13.1</version>
247246
<scope>test</scope>
248247
</dependency>
249248
</dependencies>
@@ -263,7 +262,7 @@
263262
<plugin>
264263
<groupId>org.apache.maven.plugins</groupId>
265264
<artifactId>maven-site-plugin</artifactId>
266-
<version>3.9.0</version>
265+
<version>3.9.1</version>
267266
</plugin>
268267
<plugin>
269268
<groupId>org.apache.maven.plugins</groupId>
@@ -291,26 +290,12 @@
291290
<plugins>
292291
<plugin>
293292
<artifactId>maven-enforcer-plugin</artifactId>
294-
<executions>
295-
<execution>
296-
<id>enforce-bytecode-version</id>
297-
<configuration>
298-
<rules>
299-
<enforceBytecodeVersion>
300-
<excludes>
301-
<!-- ASM supports Java 1.5+, see https://asm.ow2.io/faq.html#Q14 -->
302-
<exclude>org.ow2.asm:*</exclude>
303-
</excludes>
304-
</enforceBytecodeVersion>
305-
</rules>
306-
</configuration>
307-
</execution>
308-
</executions>
293+
<version>3.0.0-M3</version>
309294
<dependencies>
310295
<dependency>
311296
<groupId>org.codehaus.mojo</groupId>
312297
<artifactId>extra-enforcer-rules</artifactId>
313-
<version>1.2</version>
298+
<version>1.3</version>
314299
</dependency>
315300
</dependencies>
316301
</plugin>

0 commit comments

Comments
 (0)
Please sign in to comment.