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/13 21:41:19 UTC
svn commit: r734236 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3680/ resources/mng-3680/dep-repo/
resources/mng-3680/maven-mng3680-plugin/ resources/mng-3680/repo/
resources/mng-3680/repo/...
Author: bentmann
Date: Tue Jan 13 12:40:59 2009
New Revision: 734236
URL: http://svn.apache.org/viewvc?rev=734236&view=rev
Log:
o Decoupled IT for MNG-3680 from production deps/plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/dep-repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/maven-mng3680-plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java?rev=734236&r1=734235&r2=734236&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java Tue Jan 13 12:40:59 2009
@@ -20,46 +20,44 @@
*/
import java.io.File;
+import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
/**
- * Verify that dependencies with invalid POMs can still be used without failing
- * the build.
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3680">MNG-3680</a>.
*
* @author jdcasey
*/
public class MavenITmng3680InvalidDependencyPOMTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng3680InvalidDependencyPOMTest()
{
super( "(2.0.9,)" );
}
-
+
+ /**
+ * Verify that dependencies with invalid POMs can still be used without failing the build.
+ */
public void testitMNG3680 ()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3680" );
- File pluginDir = new File( testDir, "maven-mng3680-plugin" );
-
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- verifier = new Verifier( testDir.getAbsolutePath() );
-
- verifier.deleteArtifact( "tests", "dep-L1", "1", "jar" );
- verifier.deleteArtifact( "tests", "dep-L1", "1", "pom" );
-
- verifier.deleteArtifact( "tests", "dep-L1", "1", "jar" );
- verifier.deleteArtifact( "tests", "dep-L2", "1", "pom" );
-
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng3680" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+
+ List artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
+ assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng3680:direct:jar:0.1" ) );
+ assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng3680:transitive:jar:0.1" ) );
}
+
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/pom.xml?rev=734236&r1=734235&r2=734236&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/pom.xml Tue Jan 13 12:40:59 2009
@@ -1,45 +1,54 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.its.mng3680</groupId>
- <artifactId>mng-3680-invalidDependencyPOM</artifactId>
+ <artifactId>test</artifactId>
<packaging>jar</packaging>
<version>1</version>
- <name>mng-3680-invalidDependencyPOM</name>
+
+ <name>Maven Integration Test :: MNG-3680</name>
+ <description>
+ Verify that dependencies with invalid POMs can still be used without failing the build.
+ </description>
<repositories>
<repository>
- <id>dep-repo</id>
- <url>file://${pom.basedir}/dep-repo</url>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>tests</groupId>
- <artifactId>dep-L1</artifactId>
- <version>1</version>
+ <!-- This has a broken POM, yet it's dependencies should contribute to this build -->
+ <groupId>org.apache.maven.its.mng3680</groupId>
+ <artifactId>direct</artifactId>
+ <version>0.1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.its.mng3680</groupId>
- <artifactId>maven-mng3680-plugin</artifactId>
- <version>1</version>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
<executions>
<execution>
- <id>check-deps</id>
+ <id>test</id>
<phase>validate</phase>
+ <configuration>
+ <testArtifacts>target/artifacts.txt</testArtifacts>
+ </configuration>
<goals>
- <goal>check</goal>
+ <goal>test</goal>
</goals>
</execution>
</executions>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.jar?rev=734236&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.pom?rev=734236&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/0.1/direct-0.1.pom Tue Jan 13 12:40:59 2009
@@ -0,0 +1,57 @@
+<?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.mng3680</groupId>
+ <artifactId>direct</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3680</groupId>
+ <artifactId>transitive</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <!--
+ This is an invalid repositories section (missing <repository> element), which would trip up the model parser
+ if it were used in strict mode, or if the handling of the strict-mode flag
+ doesn't apply to association lists.
+
+ Dependency POMs should always be parsed in non-strict mode, so this
+ shouldn't prevent the inclusion of the above dependency.
+ -->
+ <repositories>
+ <id>imaginary-repo</id>
+ <url>http://repository.imaginary/</url>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml?rev=734236&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml Tue Jan 13 12:40:59 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng3680</groupId>
+ <artifactId>direct</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090113200208</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/direct/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.jar?rev=734236&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.pom?rev=734236&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/0.1/transitive-0.1.pom Tue Jan 13 12:40:59 2009
@@ -0,0 +1,36 @@
+<?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.mng3680</groupId>
+ <artifactId>transitive</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml?rev=734236&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml Tue Jan 13 12:40:59 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng3680</groupId>
+ <artifactId>transitive</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090113200129</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3680/repo/org/apache/maven/its/mng3680/transitive/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision