Author: bentmann
Date: Mon Dec 29 11:16:26 2008
New Revision: 729974
URL: http://svn.apache.org/viewvc?rev=729974&view=rev
Log:
o Decoupled it0010 from production deps/plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java?rev=729974&r1=729973&r2=729974&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
Mon Dec 29 11:16:26 2008
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.List;
public class MavenIT0010Test
extends AbstractMavenIntegrationTestCase
@@ -31,22 +32,28 @@
/**
* Since the artifact resolution does not use the project builder, we must
* ensure that the full hierarchy of all dependencies is resolved. This
- * includes the dependencies of the parent-pom's of dependencies. This test
- * will check this, by depending on classworlds, which is a dependency of
- * maven-component, which is the parent of maven-plugin, which is an
- * explicit dependency of this test.
- * # TODO: must correct the assumptions of this test
+ * includes the dependencies of the parent-pom's of dependencies.
*/
public void testit0010()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0010" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.assertFilePresent(
"target/classes/org/apache/maven/it0010/PersonFinder.class" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0010" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "a",
"0.1", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "b",
"0.2", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0010",
"parent", "1.0", "pom" );
+
+ List artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.it0010:a:jar:0.1" ) );
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.it0010:b:jar:0.2" ) );
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/pom.xml?rev=729974&r1=729973&r2=729974&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/pom.xml
Mon Dec 29 11:16:26 2008
@@ -1,32 +1,81 @@
+<?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 :: it0010</name>
+
<groupId>org.apache.maven.its.it0010</groupId>
- <artifactId>maven-it-it0010</artifactId>
- <description>Since the artifact resolution does not use the project builder,
we must
- ensure that the full hierarchy of all dependencies is resolved. This
- includes the dependencies of the parent-pom's of dependencies. This
test
- will check this, by depending on classworlds, which is a dependency of
- maven-component, which is the parent of maven-plugin, which is an
- explicit dependency of this test.
- # TODO: must correct the assumptions of this test
- </description>
- <packaging>jar</packaging>
+ <artifactId>test</artifactId>
<version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: it0010</name>
+ <description>
+ Since the artifact resolution does not use the project builder, we must
+ ensure that the full hierarchy of all dependencies is resolved. This
+ includes the dependencies of the parent-pom's of dependencies.
+ </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</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0-beta-1</version>
+ <groupId>org.apache.maven.its.it0010</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <type>jar</type>
- <scope>test</scope>
- </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>
+ <compileArtifacts>target/compile.txt</compileArtifacts>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar?rev=729974&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom?rev=729974&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom
Mon Dec 29 11:16:26 2008
@@ -0,0 +1,45 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.its.it0010</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </properties>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml?rev=729974&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
Mon Dec 29 11:16:26 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0010</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081229185855</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar?rev=729974&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom?rev=729974&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom
Mon Dec 29 11:16:26 2008
@@ -0,0 +1,40 @@
+<?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.it0010</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </properties>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml?rev=729974&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
Mon Dec 29 11:16:26 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0010</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <versioning>
+ <release>0.2</release>
+ <versions>
+ <version>0.2</version>
+ </versions>
+ <lastUpdated>20081229185350</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom?rev=729974&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom
Mon Dec 29 11:16:26 2008
@@ -0,0 +1,48 @@
+<?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.it0010</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0010</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml?rev=729974&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
Mon Dec 29 11:16:26 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0010</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <versioning>
+ <release>1.0</release>
+ <versions>
+ <version>1.0</version>
+ </versions>
+ <lastUpdated>20081229185535</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
