You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/08/20 14:59:55 UTC
git commit: MNG-5503: IT for the issue where Maven 3.1.0 fails to
resolve artifacts produced by reactor build
Updated Branches:
refs/heads/master a222c5cf5 -> 6473a4312
MNG-5503: IT for the issue where Maven 3.1.0 fails to resolve artifacts produced by reactor build
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/6473a431
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/6473a431
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/6473a431
Branch: refs/heads/master
Commit: 6473a43126fefc724e934fb355bc7715e97d4ebf
Parents: a222c5c
Author: Jason van Zyl <ja...@tesla.io>
Authored: Tue Aug 20 05:59:47 2013 -0700
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Tue Aug 20 05:59:47 2013 -0700
----------------------------------------------------------------------
.gitignore | 1 +
.../it/MavenITmng5503ZipInReactorTest.java | 57 ++++++++++++++++++++
.../test/resources/mng-5503/module-a/pom.xml | 30 +++++++++++
.../test/resources/mng-5503/module-a/zip.xml | 16 ++++++
.../test/resources/mng-5503/module-b/pom.xml | 14 +++++
.../src/test/resources/mng-5503/pom.xml | 11 ++++
6 files changed, 129 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6473a431/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index aa2d966..19e8f6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
.svn
target
+repo
.project
.classpath
.settings
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6473a431/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java
new file mode 100644
index 0000000..404f514
--- /dev/null
+++ b/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 <a href="http://jira.codehaus.org/browse/MNG-5503">MNG-5418</a>.
+ *
+ * @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();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6473a431/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml b/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml
new file mode 100644
index 0000000..6632f54
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-5503/module-a/pom.xml
@@ -0,0 +1,30 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>module-a</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <descriptors>
+ <descriptor>zip.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6473a431/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml b/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml
new file mode 100644
index 0000000..5b7b488
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-5503/module-a/zip.xml
@@ -0,0 +1,16 @@
+<assembly>
+ <id>zip</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6473a431/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml b/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml
new file mode 100644
index 0000000..50a4707
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-5503/module-b/pom.xml
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>module-b</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>module-a</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/6473a431/core-it-suite/src/test/resources/mng-5503/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5503/pom.xml b/core-it-suite/src/test/resources/mng-5503/pom.xml
new file mode 100644
index 0000000..daf0b02
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-5503/pom.xml
@@ -0,0 +1,11 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>mng-5503-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>module-a</module>
+ <module>module-b</module>
+ </modules>
+</project>