You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/01 21:08:00 UTC
svn commit: r709770 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0080/ resources/it0080/repo/
resources/it0080/repo/org/ resources/it0080/repo/org/apache/
resources/it0080/repo/org/apache/mave...
Author: bentmann
Date: Sat Nov 1 13:08:00 2008
New Revision: 709770
URL: http://svn.apache.org/viewvc?rev=709770&view=rev
Log:
o Decoupled it0080 from production plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.war (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/test-component-a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/test-component-b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/test-component-c/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java?rev=709770&r1=709769&r2=709770&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0080Test.java Sat Nov 1 13:08:00 2008
@@ -23,32 +23,31 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Collection;
+import java.util.Collections;
public class MavenIT0080Test
extends AbstractMavenIntegrationTestCase
{
/**
- * Test that depending on a WAR doesn't also get its dependencies
- * transitively.
+ * Test that depending on a WAR doesn't also get its dependencies transitively.
*/
public void testit0080()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0080" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" );
- verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.war" );
- verifier.assertFilePresent(
- "test-component-b/target/test-component-b-0.1.war!/WEB-INF/lib/test-component-a-0.1.jar" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.ear" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.ear!/test-component-b-0.1.war" );
- verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1/test-component-b-0.1.war" );
- verifier.assertFileNotPresent( "test-component-c/target/test-component-c-0.1/test-component-a-0.1.jar" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0080" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ Collection artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
+ assertEquals( Collections.singletonList( "org.apache.maven.its.it0080:war:war:0.1" ), artifacts );
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/pom.xml?rev=709770&r1=709769&r2=709770&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/pom.xml Sat Nov 1 13:08:00 2008
@@ -1,15 +1,78 @@
+<?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>
- <name>Maven Integration Test :: it0080</name>
+
<groupId>org.apache.maven.its.it0080</groupId>
- <artifactId>maven-it-it0080</artifactId>
- <description>Test that depending on a WAR doesn't also get its dependencies
- transitively.</description>
+ <artifactId>test</artifactId>
<version>0.1</version>
- <packaging>pom</packaging>
- <modules>
- <module>test-component-c</module>
- <module>test-component-b</module>
- <module>test-component-a</module>
- </modules>
+ <packaging>ear</packaging>
+
+ <name>Maven Integration Test :: it0080</name>
+ <description>
+ Test that depending on a WAR doesn't also get its dependencies transitively.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0080</groupId>
+ <artifactId>war</artifactId>
+ <version>0.1</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <projectArtifacts>target/artifacts.txt</projectArtifacts>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.jar?rev=709770&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.pom?rev=709770&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/0.1/jar-0.1.pom Sat Nov 1 13:08:00 2008
@@ -0,0 +1,55 @@
+<?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.it0080</groupId>
+ <artifactId>jar</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml?rev=709770&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml Sat Nov 1 13:08:00 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0080</groupId>
+ <artifactId>jar</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081101185851</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/jar/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.pom?rev=709770&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.pom Sat Nov 1 13:08:00 2008
@@ -0,0 +1,64 @@
+<?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.it0080</groupId>
+ <artifactId>war</artifactId>
+ <version>0.1</version>
+ <packaging>war</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0080</groupId>
+ <artifactId>jar</artifactId>
+ <version>0.1</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.war
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.war?rev=709770&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/0.1/war-0.1.war
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml?rev=709770&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml Sat Nov 1 13:08:00 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0080</groupId>
+ <artifactId>war</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081101191108</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0080/repo/org/apache/maven/its/it0080/war/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision