diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 447965ca78..72adc475f2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -85,6 +85,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4396AntBasedMojoSupportTest.class ); suite.addTestSuite( MavenITmng4393ParseExternalParenPomLenientTest.class ); suite.addTestSuite( MavenITmng4387QuietLoggingTest.class ); suite.addTestSuite( MavenITmng4386DebugLoggingTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBasedMojoSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBasedMojoSupportTest.java new file mode 100644 index 0000000000..b32abde877 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBasedMojoSupportTest.java @@ -0,0 +1,59 @@ +package org.apache.maven.it; + +/* + * 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. + */ + +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; + +/** + * This is a test set for MNG-4396. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4396AntBasedMojoSupportTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4396AntBasedMojoSupportTest() + { + super( ALL_MAVEN_VERSIONS ); + } + + /** + * Verify that plugins whose mojos are implemented as Ant scripts can be invoked. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4396" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertFilePresent( "target/ant.txt" ); + } + +} 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 new file mode 100644 index 0000000000..5a2730ab5c --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4396/pom.xml @@ -0,0 +1,55 @@ + + + + + + 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 + validate + + touch + + + + + + + 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 new file mode 100644 index 0000000000..ad31dcc9e7 --- /dev/null +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/pom.xml @@ -0,0 +1,96 @@ + + + + + + 4.0.0 + + + maven-it-plugins + org.apache.maven.its.plugins + 2.1-SNAPSHOT + + + maven-it-plugin-ant-based + maven-plugin + + Maven Integration Test Plugin :: Ant-Based + + A test plugin whose mojos are implemented via Ant scripts. + + 2009 + + + true + + + + + org.apache.maven + maven-script-ant + 2.0.6 + + + ant + ant + + + ant + ant-launcher + + + + + org.apache.ant + ant + 1.7.1 + + + org.apache.ant + ant-launcher + 1.7.1 + + + + + + + maven-plugin-plugin + + 2.4.2 + + + org.apache.maven.plugin-tools + maven-plugin-tools-ant + 2.4.2 + + + + + + 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 new file mode 100644 index 0000000000..7593259d56 --- /dev/null +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.build.xml @@ -0,0 +1,27 @@ + + + + + + + + + + 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 new file mode 100644 index 0000000000..14fe67110c --- /dev/null +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml @@ -0,0 +1,38 @@ + + + + + + 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/pom.xml b/its/core-it-support/core-it-plugins/pom.xml index 1d8e9c84a7..ab5a714a79 100644 --- a/its/core-it-support/core-it-plugins/pom.xml +++ b/its/core-it-support/core-it-plugins/pom.xml @@ -33,6 +33,7 @@ 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 diff --git a/its/core-it-support/pom.xml b/its/core-it-support/pom.xml index dbe0836941..b2a804d365 100644 --- a/its/core-it-support/pom.xml +++ b/its/core-it-support/pom.xml @@ -16,7 +16,8 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--> + 4.0.0 @@ -72,4 +73,4 @@ under the License. - \ No newline at end of file +