This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 88c6ff5e7e IT: Consolidate ITs somewhat (#1924)
88c6ff5e7e is described below
commit 88c6ff5e7ea274072fe13e5b8f84b541143655dc
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Nov 19 14:30:27 2024 +0100
IT: Consolidate ITs somewhat (#1924)
Align versions where possible, remove dead stuff.
Ant based Mojos were deprecated in Maven3 era, and
this is Maven4, so no need to test this. Is full
of ancient artifacts anyway.
---
its/core-it-suite/pom.xml | 122 +--------------------
.../MavenITmng4396AntBased20xMojoSupportTest.java | 56 ----------
.../MavenITmng4786AntBased21xMojoSupportTest.java | 58 ----------
.../org/apache/maven/it/TestSuiteOrdering.java | 2 -
.../src/test/resources/mng-4396/pom.xml | 51 ---------
.../src/test/resources/mng-4786/pom.xml | 80 --------------
.../maven-it-plugin-ant-based/pom.xml | 104 ------------------
.../src/main/resources/META-INF/maven/plugin.xml | 114 -------------------
.../src/main/scripts/touch.build.xml | 27 -----
.../src/main/scripts/touch.mojos.xml | 38 -------
.../maven-it-plugin-ant-based/src/site/site.xml | 33 ------
.../maven-it-plugin-configuration/pom.xml | 12 ++
.../maven-it-plugin-core-stubs/pom.xml | 12 ++
.../maven-it-plugin-uses-wagon/pom.xml | 4 +-
its/core-it-support/core-it-plugins/pom.xml | 13 ++-
its/core-it-support/core-it-wagon/pom.xml | 2 +-
.../maven-it-plugin-bootstrap/pom.xml | 11 ++
its/pom.xml | 4 +-
18 files changed, 53 insertions(+), 690 deletions(-)
diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml
index a3274b3c37..361a2d299f 100644
--- a/its/core-it-suite/pom.xml
+++ b/its/core-it-suite/pom.xml
@@ -96,7 +96,6 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
<!-- NOTE: Use compile scope for transitivity. -->
</dependency>
<dependency>
@@ -249,11 +248,6 @@ under the License.
<artifactId>maven-it-plugin-active-collection</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-ant-based</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-artifact</artifactId>
@@ -585,7 +579,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>3.5.3</version>
+ <version>${wagonVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -822,120 +816,6 @@ under the License.
</plugins>
</build>
</profile>
- <profile>
- <id>emma</id>
- <properties>
-
<preparedMavenHome>${project.build.directory}/distro</preparedMavenHome>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-maven-distro</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>process-test-classes</phase>
- <configuration>
- <target>
- <delete dir="${preparedMavenHome}" />
- <copy overwrite="true" todir="${preparedMavenHome}">
- <fileset dir="${mavenHome}" />
- </copy>
- <chmod dir="${preparedMavenHome}/bin"
includes="mvn,mvnDebug" perm="ugo+rx" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>inject-emma-into-core-realm</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>process-test-classes</phase>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>emma</groupId>
- <artifactId>emma</artifactId>
- <version>2.1.5320</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${preparedMavenHome}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- <version>1.3</version>
- <configuration>
- <jarSets>
- <jarSet>
- <directory>${preparedMavenHome}/lib</directory>
- <includes>
- <include>maven*.jar</include>
- </includes>
- </jarSet>
- </jarSets>
- <includes>
- <include>org.apache.maven.*</include>
- </includes>
- <excludes>
- <exclude>*.io.xpp3.*</exclude>
- <exclude>*Exception</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- <phase>process-test-classes</phase>
- </execution>
- <execution>
- <id>report</id>
- <goals>
- <goal>report</goal>
- </goals>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>coverage.ec</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>proxy</id>
<activation>
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
deleted file mode 100644
index 3d86da2da3..0000000000
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.it;
-
-import java.io.File;
-
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
-import org.junit.jupiter.api.Test;
-
-/**
- * This is a test set for <a
href="https://issues.apache.org/jira/browse/MNG-4396";>MNG-4396</a>.
- *
- * @author Benjamin Bentmann
- */
-public class MavenITmng4396AntBased20xMojoSupportTest extends
AbstractMavenIntegrationTestCase {
-
- public MavenITmng4396AntBased20xMojoSupportTest() {
- super(ALL_MAVEN_VERSIONS);
- }
-
- /**
- * Verify that plugins whose mojos are implemented as Ant scripts and use
the Maven 2.0.x Ant support can be
- * invoked.
- *
- * @throws Exception in case of failure
- */
- @Test
- public void testit() throws Exception {
- File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4396");
-
- Verifier verifier = newVerifier(testDir.getAbsolutePath());
- verifier.setAutoclean(false);
- verifier.deleteDirectory("target");
- verifier.addCliArgument("validate");
- verifier.execute();
- verifier.verifyErrorFreeLog();
-
- verifier.verifyFilePresent("target/ant.txt");
- }
-}
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
deleted file mode 100644
index ab5d48d360..0000000000
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.it;
-
-import java.io.File;
-
-import org.apache.maven.shared.verifier.util.ResourceExtractor;
-import org.junit.jupiter.api.Test;
-
-/**
- * This is a test set for <a
href="https://issues.apache.org/jira/browse/MNG-4786";>MNG-4786</a>.
- *
- * @author Benjamin Bentmann
- */
-public class MavenITmng4786AntBased21xMojoSupportTest extends
AbstractMavenIntegrationTestCase {
-
- public MavenITmng4786AntBased21xMojoSupportTest() {
- super("[2.0.3,3.0-alpha-1),[3.0-beta-4,)");
- }
-
- /**
- * Verify that plugins whose mojos are implemented as Ant scripts and use
the Maven 2.1.x Ant support can be
- * invoked. The essential bits here are that Ant-based mojos are
instantiated via a custom component factory, yet
- * must undergo the same IoC as for regular Java components. And the 2.1.x
Ant support actually requires injection
- * of a logger.
- *
- * @throws Exception in case of failure
- */
- @Test
- public void testit() throws Exception {
- File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4786");
-
- Verifier verifier = newVerifier(testDir.getAbsolutePath());
- verifier.setAutoclean(false);
- verifier.deleteDirectory("target");
- verifier.addCliArgument("validate");
- verifier.execute();
- verifier.verifyErrorFreeLog();
-
- verifier.verifyFilePresent("target/ant.txt");
- }
-}
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
index 191f016a66..be444bac9d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
@@ -294,7 +294,6 @@ public class TestSuiteOrdering implements ClassOrderer {
suite.addTestSuite(MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.class);
suite.addTestSuite(MavenITmng4789ScopeInheritanceMeetsConflictTest.class);
suite.addTestSuite(MavenITmng4788InstallationToCustomLocalRepoTest.class);
- suite.addTestSuite(MavenITmng4786AntBased21xMojoSupportTest.class);
suite.addTestSuite(MavenITmng4785TransitiveResolutionInForkedThreadTest.class);
suite.addTestSuite(MavenITmng4781DeploymentToNexusStagingRepoTest.class);
suite.addTestSuite(MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.class);
@@ -375,7 +374,6 @@ public class TestSuiteOrdering implements ClassOrderer {
suite.addTestSuite(MavenITmng4402DuplicateChildModuleTest.class);
suite.addTestSuite(MavenITmng4401RepositoryOrderForParentPomTest.class);
suite.addTestSuite(MavenITmng4400RepositoryOrderTest.class);
- suite.addTestSuite(MavenITmng4396AntBased20xMojoSupportTest.class);
suite.addTestSuite(MavenITmng4393ParseExternalParenPomLenientTest.class);
suite.addTestSuite(MavenITmng4387QuietLoggingTest.class);
suite.addTestSuite(MavenITmng4386DebugLoggingTest.class);
diff --git a/its/core-it-suite/src/test/resources/mng-4396/pom.xml
b/its/core-it-suite/src/test/resources/mng-4396/pom.xml
deleted file mode 100644
index e1cf6ce608..0000000000
--- a/its/core-it-suite/src/test/resources/mng-4396/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4396</groupId>
- <artifactId>test</artifactId>
- <version>0.1</version>
-
- <name>Maven Integration Test :: MNG-4396</name>
- <description>Verify that plugins whose mojos are implemented as Ant scripts
can be invoked.</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-ant-based</artifactId>
- <version>2.1-SNAPSHOT</version>
- <configuration>
- <outputFile>target/ant.txt</outputFile>
- </configuration>
- <executions>
- <execution>
- <id>test</id>
- <goals>
- <goal>touch</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4786/pom.xml
b/its/core-it-suite/src/test/resources/mng-4786/pom.xml
deleted file mode 100644
index 1d601f43d5..0000000000
--- a/its/core-it-suite/src/test/resources/mng-4786/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.its.mng4786</groupId>
- <artifactId>test</artifactId>
- <version>0.1</version>
-
- <name>Maven Integration Test :: MNG-4786</name>
- <description>Verify that plugins whose mojos are implemented as Ant scripts
and use the Maven 2.1.x Ant support can be
- invoked. The essential bits here are that Ant-based mojos are instantiated
via a custom component factory, yet
- must undergo the same IoC as for regular Java components. And the 2.1.x
Ant support actually requires injection
- of a logger.</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-ant-based</artifactId>
- <version>2.1-SNAPSHOT</version>
- <configuration>
- <outputFile>target/ant.txt</outputFile>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-script-ant</artifactId>
- <version>2.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-io</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>test</id>
- <goals>
- <goal>touch</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml
deleted file mode 100644
index bceffe5467..0000000000
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugins</artifactId>
- <version>2.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>maven-it-plugin-ant-based</artifactId>
- <packaging>maven-plugin</packaging>
-
- <name>Maven IT Plugin :: Ant-Based</name>
- <description>A test plugin whose mojos are implemented via Ant
scripts.</description>
- <inceptionYear>2009</inceptionYear>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-script-ant</artifactId>
- <version>3.15.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.10.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.10.15</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <!-- NOTE: Ensure Ant scripts get copied to JAR regardless of
MPLUGIN-136/MNG-3741 -->
- <directory>src/main/scripts</directory>
- <includes>
- <include>**/*.build.xml</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <!--
- NOTE: We deliberately use version 2.4.x here as it produces
interesting plugin descriptors for Ant-based
- mojos, namely something like
<implementation>/touch.build.xml:touch</implementation>. Note the leading
- slash in this case. This string will be used as a resource name to
load the Ant script from the plugin
- class path which requires some special treatment to work
(ClassLoader.getResource() usually does not find
- resources that have a leading slash).
- NOTE: We use a version that is different from the version used by the
other modules to workaround MNG-1323
- via MNG-3284.
-
- cstamas: this above is untrue anymore, plugin and suite updated to 3.x
as part of Maven 4 work.
- -->
- <version>3.15.1</version>
- <configuration>
- <!-- NOTE: We use a handwritten descriptor to decouple from
MPLUGIN-136/MNG-3741 so dump the generated one -->
- <outputDirectory>${project.build.directory}</outputDirectory>
- <goalPrefix>maven-it-plugin-ant-based</goalPrefix>
- <extractors>
- <extractor>ant</extractor>
- </extractors>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-ant</artifactId>
- <version>3.15.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/resources/META-INF/maven/plugin.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/resources/META-INF/maven/plugin.xml
deleted file mode 100644
index 5f6725e324..0000000000
---
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/resources/META-INF/maven/plugin.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- NOTE: Using handwritten descriptor to decouple from MPLUGIN-136/MNG-3741
-->
-<plugin>
- <description>A test plugin whose mojos are implemented via Ant
scripts.</description>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-ant-based</artifactId>
- <version>2.1-SNAPSHOT</version>
- <goalPrefix>itant-based</goalPrefix>
- <isolatedRealm>false</isolatedRealm>
- <inheritedByDefault>true</inheritedByDefault>
- <mojos>
- <mojo>
- <goal>touch</goal>
- <description>Creates a touch file.</description>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>false</inheritedByDefault>
- <implementation>/touch.build.xml:touch</implementation>
- <language>ant-mojo</language>
- <configurator>map-oriented</configurator>
- <composer>map-oriented</composer>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <parameters>
- <parameter>
- <name>outputFile</name>
- <type>java.io.File</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the touch file.</description>
- </parameter>
- <parameter>
- <name>basedir</name>
- <alias>ant.basedir</alias>
- <type>java.io.File</type>
- <required>true</required>
- <editable>true</editable>
- <description>The base directory from which to execute the Ant
script.</description>
- </parameter>
- <parameter>
- <name>messageLevel</name>
- <alias>ant.messageLevel</alias>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The message-level used to tune the verbosity of Ant
logging.</description>
- </parameter>
- </parameters>
- <configuration>
- <outputFile implementation="java.io.File"
default-value="target/touch.txt"/>
- <basedir implementation="java.io.File"
default-value="${basedir}">${antBasedir}</basedir>
- <messageLevel implementation="java.lang.String"
default-value="info">${antMessageLevel}</messageLevel>
- </configuration>
- </mojo>
- </mojos>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-script-ant</artifactId>
- <type>jar</type>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>3.8.6</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-ant-factory</artifactId>
- <type>jar</type>
- <version>1.0-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- <version>1.0.5</version>
- </dependency>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <type>jar</type>
- <version>1.1-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- <version>1.0-alpha-9-stable-1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <type>jar</type>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <type>jar</type>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <type>jar</type>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
-</plugin>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.build.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.build.xml
deleted file mode 100644
index 7593259d56..0000000000
---
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project name="IT" default="touch" basedir=".">
-
- <target name="touch" description="Creates a touch file.">
- <echo level="info" message="[MAVEN-CORE-IT-LOG] Creating touch file
${outputFile}" />
- <touch file="${outputFile}" mkdirs="true" />
- </target>
-
-</project>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml
deleted file mode 100644
index 8783cd2927..0000000000
---
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<pluginMetadata>
- <mojos>
- <mojo>
- <goal>touch</goal>
- <call>touch</call>
- <description>Creates a touch file.</description>
- <requiresProject>true</requiresProject>
- <parameters>
- <parameter>
- <name>touch.outputFile</name>
- <property>outputFile</property>
- <defaultValue>target/touch.txt</defaultValue>
- <type>java.io.File</type>
- <description>The path to the touch file.</description>
- </parameter>
- </parameters>
- </mojo>
- </mojos>
-</pluginMetadata>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/site/site.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/site/site.xml
deleted file mode 100644
index 18f84c5769..0000000000
---
a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/site/site.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.3.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0
http://maven.apache.org/xsd/decoration-1.3.0.xsd";
- name="Plugins">
- <body>
-
- <menu name="Overview">
- <item name="Introduction" href="index.html"/>
- <item name="Goals" href="plugin-info.html"/>
- </menu>
-
- </body>
-</project>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
index d922d5d29c..88b2fab8ca 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/pom.xml
@@ -55,4 +55,16 @@ under the License.
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>itconfiguration</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml
index d58dea9996..088aed014f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/pom.xml
@@ -50,4 +50,16 @@ under the License.
<module>maven-surefire-plugin</module>
<module>maven-war-plugin</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix combine.self="override" />
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
index d27fac9dec..21c8706112 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
@@ -51,12 +51,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>3.5.3</version>
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>3.5.3</version>
+ <version>${wagonVersion}</version>
</dependency>
</dependencies>
</project>
diff --git a/its/core-it-support/core-it-plugins/pom.xml
b/its/core-it-support/core-it-plugins/pom.xml
index ef7f6ba889..2f4582c8f6 100644
--- a/its/core-it-support/core-it-plugins/pom.xml
+++ b/its/core-it-support/core-it-plugins/pom.xml
@@ -35,7 +35,6 @@ under the License.
<modules>
<module>maven-it-plugin-active-collection</module>
- <module>maven-it-plugin-ant-based</module>
<module>maven-it-plugin-artifact</module>
<module>maven-it-plugin-class-loader</module>
<module>maven-it-plugin-configuration</module>
@@ -102,6 +101,18 @@ under the License.
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>fluke</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
diff --git a/its/core-it-support/core-it-wagon/pom.xml
b/its/core-it-support/core-it-wagon/pom.xml
index cb6a50ca82..24198cd66c 100644
--- a/its/core-it-support/core-it-wagon/pom.xml
+++ b/its/core-it-support/core-it-wagon/pom.xml
@@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>3.5.3</version>
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/its/core-it-support/maven-it-plugin-bootstrap/pom.xml
b/its/core-it-support/maven-it-plugin-bootstrap/pom.xml
index bfde342026..5c91f927ad 100644
--- a/its/core-it-support/maven-it-plugin-bootstrap/pom.xml
+++ b/its/core-it-support/maven-it-plugin-bootstrap/pom.xml
@@ -61,4 +61,15 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>bootstrap</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/its/pom.xml b/its/pom.xml
index 9c8bc58c4b..719ef76b3f 100644
--- a/its/pom.xml
+++ b/its/pom.xml
@@ -74,7 +74,7 @@ under the License.
<!-- <maven.compiler.target>8</maven.compiler.target>-->
<maven-version>4.0.0-beta-6-SNAPSHOT</maven-version>
- <maven-plugin-tools-version>3.6.4</maven-plugin-tools-version>
+ <maven-plugin-tools-version>3.15.1</maven-plugin-tools-version>
</properties>
<dependencyManagement>
@@ -167,7 +167,7 @@ under the License.
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>3.5.2</version>
+ <version>${maven-plugin-tools-version}</version>
</tagletArtifact>
</tagletArtifacts>
</configuration>
