diff --git a/its/.gitignore b/its/.gitignore index aa2d9663cf..19e8f6af54 100644 --- a/its/.gitignore +++ b/its/.gitignore @@ -1,5 +1,6 @@ .svn target +repo .project .classpath .settings diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java new file mode 100644 index 0000000000..404f514b44 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java @@ -0,0 +1,57 @@ +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.util.ResourceExtractor; + +import java.io.File; + +/** + * This is a test set for MNG-5418. + * + * @author jvz + */ +public class MavenITmng5503ZipInReactorTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng5503ZipInReactorTest() + { + super( "[3.1,)" ); + } + + /** + * Test that zip attached in the assembly plugin is found in the reactor. Simply running verify is sufficient to know that + * it is found with this project setup. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5503" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "verify" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml new file mode 100644 index 0000000000..6632f54ba3 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml @@ -0,0 +1,30 @@ + + 4.0.0 + org.apache.maven + module-a + 1.0.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + zip.xml + + false + + + + assemble + package + + single + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml b/its/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml new file mode 100644 index 0000000000..5b7b4882a4 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml @@ -0,0 +1,16 @@ + + zip + + zip + + + + ${project.basedir} + / + + pom.xml + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml new file mode 100644 index 0000000000..50a4707cec --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + org.apache.maven + module-b + 1.0.0-SNAPSHOT + + + org.apache.maven + module-a + 1.0.0-SNAPSHOT + zip + + + diff --git a/its/core-it-suite/src/test/resources/mng-5503/pom.xml b/its/core-it-suite/src/test/resources/mng-5503/pom.xml new file mode 100644 index 0000000000..daf0b026e6 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-5503/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + org.apache.maven + mng-5503-parent + 1.0.0-SNAPSHOT + pom + + module-a + module-b + +