From 88c6ff5e7ea274072fe13e5b8f84b541143655dc Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 19 Nov 2024 14:30:27 +0100 Subject: [PATCH] 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 +----------------- ...enITmng4396AntBased20xMojoSupportTest.java | 56 -------- ...enITmng4786AntBased21xMojoSupportTest.java | 58 --------- .../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 --------------- .../main/resources/META-INF/maven/plugin.xml | 114 ---------------- .../src/main/scripts/touch.build.xml | 27 ---- .../src/main/scripts/touch.mojos.xml | 38 ------ .../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(-) delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java delete mode 100644 its/core-it-suite/src/test/resources/mng-4396/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/mng-4786/pom.xml delete mode 100644 its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml delete mode 100644 its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/resources/META-INF/maven/plugin.xml delete mode 100644 its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.build.xml delete mode 100644 its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml delete mode 100644 its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/site/site.xml 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. org.codehaus.plexus plexus-utils - 3.3.0 @@ -249,11 +248,6 @@ under the License. maven-it-plugin-active-collection ${project.version} - - org.apache.maven.its.plugins - maven-it-plugin-ant-based - ${project.version} - org.apache.maven.its.plugins maven-it-plugin-artifact @@ -585,7 +579,7 @@ under the License. org.apache.maven.wagon wagon-webdav-jackrabbit - 3.5.3 + ${wagonVersion} test @@ -822,120 +816,6 @@ under the License. - - emma - - ${project.build.directory}/distro - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-maven-distro - - run - - process-test-classes - - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - inject-emma-into-core-realm - - copy - - process-test-classes - - - - emma - emma - 2.1.5320 - - - ${preparedMavenHome}/lib - - - - - - org.sonatype.maven.plugin - emma4it-maven-plugin - 1.3 - - - - ${preparedMavenHome}/lib - - maven*.jar - - - - - org.apache.maven.* - - - *.io.xpp3.* - *Exception - - - - - instrument - - instrument - - process-test-classes - - - report - - report - - test - - - - - org.apache.maven.plugins - maven-clean-plugin - - - - ${basedir} - - coverage.ec - - - - - - - - proxy 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 MNG-4396. - * - * @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 MNG-4786. - * - * @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 @@ - - - - 4.0.0 - - org.apache.maven.its.mng4396 - test - 0.1 - - Maven Integration Test :: MNG-4396 - Verify that plugins whose mojos are implemented as Ant scripts can be invoked. - - - - - org.apache.maven.its.plugins - maven-it-plugin-ant-based - 2.1-SNAPSHOT - - target/ant.txt - - - - test - - touch - - validate - - - - - - 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 @@ - - - - 4.0.0 - - org.apache.maven.its.mng4786 - test - 0.1 - - Maven Integration Test :: MNG-4786 - 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. - - - - - org.apache.maven.its.plugins - maven-it-plugin-ant-based - 2.1-SNAPSHOT - - target/ant.txt - - - - org.apache.maven - maven-script-ant - 2.1.0 - - - org.apache.maven - maven-project - - - org.apache.maven - maven-core - - - org.codehaus.plexus - plexus-component-api - - - - - org.codehaus.plexus - plexus-io - 1.0 - - - - - test - - touch - - validate - - - - - - 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 @@ - - - - 4.0.0 - - - org.apache.maven.its.plugins - maven-it-plugins - 2.1-SNAPSHOT - - - maven-it-plugin-ant-based - maven-plugin - - Maven IT Plugin :: Ant-Based - A test plugin whose mojos are implemented via Ant scripts. - 2009 - - - true - - - - - org.apache.maven.plugin-tools - maven-script-ant - 3.15.1 - - - org.apache.ant - ant - 1.10.15 - - - org.apache.ant - ant-launcher - 1.10.15 - - - - - - - src/main/resources - - - - src/main/scripts - - **/*.build.xml - - - - - - maven-plugin-plugin - - 3.15.1 - - - ${project.build.directory} - maven-it-plugin-ant-based - - ant - - - - - org.apache.maven.plugin-tools - maven-plugin-tools-ant - 3.15.1 - - - - - - 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 @@ - - - - A test plugin whose mojos are implemented via Ant scripts. - org.apache.maven.its.plugins - maven-it-plugin-ant-based - 2.1-SNAPSHOT - itant-based - false - true - - - touch - Creates a touch file. - false - true - false - false - false - false - /touch.build.xml:touch - ant-mojo - map-oriented - map-oriented - per-lookup - once-per-session - - - outputFile - java.io.File - false - true - The path to the touch file. - - - basedir - ant.basedir - java.io.File - true - true - The base directory from which to execute the Ant script. - - - messageLevel - ant.messageLevel - java.lang.String - false - true - The message-level used to tune the verbosity of Ant logging. - - - - - ${antBasedir} - ${antMessageLevel} - - - - - - org.apache.maven - maven-script-ant - jar - 2.0.6 - - - org.apache.maven - maven-plugin-api - 3.8.6 - - - org.codehaus.plexus - plexus-ant-factory - jar - 1.0-alpha-2 - - - org.codehaus.plexus - plexus-utils - jar - 1.0.5 - - - classworlds - classworlds - jar - 1.1-alpha-2 - - - org.codehaus.plexus - plexus-container-default - jar - 1.0-alpha-9-stable-1 - - - junit - junit - jar - 3.8.1 - - - org.apache.ant - ant - jar - 1.7.1 - - - org.apache.ant - ant-launcher - jar - 1.7.1 - - - 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 @@ - - - - - - - - - - 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 @@ - - - - - - touch - touch - Creates a touch file. - true - - - touch.outputFile - outputFile - target/touch.txt - java.io.File - The path to the touch file. - - - - - 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 @@ - - - - - - - - - - - - - - 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. provided + + + + + org.apache.maven.plugins + maven-plugin-plugin + + itconfiguration + + + + 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. maven-surefire-plugin maven-war-plugin + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + + + + 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. org.apache.maven.wagon wagon-ssh - 3.5.3 + ${wagonVersion} org.apache.maven.wagon wagon-file - 3.5.3 + ${wagonVersion} 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. maven-it-plugin-active-collection - maven-it-plugin-ant-based maven-it-plugin-artifact maven-it-plugin-class-loader maven-it-plugin-configuration @@ -102,6 +101,18 @@ under the License. https://repository.apache.org/content/repositories/snapshots + + + + org.apache.maven.plugins + maven-plugin-plugin + + fluke + + + + + 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. org.apache.maven.wagon wagon-provider-api - 3.5.3 + ${wagonVersion} org.codehaus.plexus 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. + + + + org.apache.maven.plugins + maven-plugin-plugin + + bootstrap + + + + 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. 4.0.0-beta-6-SNAPSHOT - 3.6.4 + 3.15.1 @@ -167,7 +167,7 @@ under the License. org.apache.maven.plugin-tools maven-plugin-tools-javadoc - 3.5.2 + ${maven-plugin-tools-version}