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 2009/01/06 22:52:54 UTC
svn commit: r732134 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0085/ resources/it0085/dep/
resources/it0085/repo/ resources/it0085/repo/org/
resources/it0085/repo/org/apache/ resources/it008...
Author: bentmann
Date: Tue Jan 6 13:52:54 2009
New Revision: 732134
URL: http://svn.apache.org/viewvc?rev=732134&view=rev
Log:
o Decoupled it0085 from production plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/system.jar (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/war/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java?rev=732134&r1=732133&r2=732134&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java Tue Jan 6 13:52:54 2009
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Collection;
public class MavenIT0085Test
extends AbstractMavenIntegrationTestCase
@@ -38,14 +39,18 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0085" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/pom.xml" );
- verifier.assertFileNotPresent( "war/target/war-1.0/WEB-INF/lib/it0085-dep-1.0.jar" );
- verifier.assertFilePresent( "war/target/war-1.0/WEB-INF/lib/junit-3.8.1.jar" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0085" );
+ verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ Collection lines = verifier.loadLines( "target/test.txt", "UTF-8" );
+ assertTrue( lines.toString(), lines.contains( "system.jar" ) );
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/pom.xml?rev=732134&r1=732133&r2=732134&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/pom.xml Tue Jan 6 13:52:54 2009
@@ -1,29 +1,61 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0085</name>
+
<groupId>org.apache.maven.its.it0085</groupId>
- <artifactId>maven-it-it0085</artifactId>
- <description>Verify that system-scoped dependencies get resolved with system scope
- when they are resolved transitively via another (non-system)
- dependency. Inherited scope should not apply in the case of
- system-scoped dependencies, no matter where they are.</description>
+ <artifactId>test</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
- <modules>
- <module>dep</module>
- <module>war</module>
- </modules>
+ <name>Maven Integration Test :: it0085</name>
+ <description>
+ Verify that system-scoped dependencies get resolved with system scope
+ when they are resolved transitively via another (non-system)
+ dependency. Inherited scope should not apply in the case of
+ system-scoped dependencies, no matter where they are.
+ </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.it0085</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.it0085</groupId>
- <artifactId>pom-dep</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${basedir}/pom.xml</systemPath>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <testClassPath>target/test.txt</testClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </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/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar?rev=732134&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom?rev=732134&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/0.1/dep-0.1.pom Tue Jan 6 13:52:54 2009
@@ -0,0 +1,46 @@
+<?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.it0085</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0085</groupId>
+ <artifactId>system</artifactId>
+ <version>0.2</version>
+ <scope>system</scope>
+ <systemPath>${test.home}/system.jar</systemPath>
+ </dependency>
+ </dependencies>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml?rev=732134&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml Tue Jan 6 13:52:54 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0085</groupId>
+ <artifactId>dep</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090106211325</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/repo/org/apache/maven/its/it0085/dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/system.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/system.jar?rev=732134&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0085/system.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream