Author: bentmann
Date: Mon Dec 29 10:27:20 2008
New Revision: 729962
URL: http://svn.apache.org/viewvc?rev=729962&view=rev
Log:
o Decoupled it0011 from production deps/plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011Test.java?rev=729962&r1=729961&r2=729962&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011Test.java
Mon Dec 29 10:27:20 2008
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.List;
public class MavenIT0011Test
extends AbstractMavenIntegrationTestCase
@@ -36,11 +37,16 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0011" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.assertFilePresent(
"target/classes/org/apache/maven/it0011/PersonFinder.class" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0011" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ List artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.it0011:a:jar:0.1" ) );
+ assertTrue( artifacts.toString(), artifacts.contains(
"org.apache.maven.its.it0011:b:jar:0.2" ) );
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/pom.xml?rev=729962&r1=729961&r2=729962&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/pom.xml
Mon Dec 29 10:27:20 2008
@@ -1,41 +1,101 @@
+<?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 :: it0011</name>
+
<groupId>org.apache.maven.its.it0011</groupId>
- <artifactId>maven-it-it0011</artifactId>
- <description>Test specification of dependency versions via
<dependencyManagement/>.</description>
- <packaging>jar</packaging>
+ <artifactId>test</artifactId>
<version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: it0011</name>
+ <description>Test specification of dependency versions via
<dependencyManagement/>.</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>
+ <groupId>org.apache.maven.its.it0011</groupId>
+ <artifactId>a</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.maven.its.it0011</groupId>
+ <artifactId>b</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
+
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0-beta-1</version>
+ <groupId>org.apache.maven.its.it0011</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>
+ <groupId>org.apache.maven.its.it0011</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
<type>jar</type>
<scope>test</scope>
</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>
+ <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/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.jar?rev=729962&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/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/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.pom?rev=729962&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/0.1/a-0.1.pom
Mon Dec 29 10:27:20 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.it0011</groupId>
+ <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/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml?rev=729962&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml
Mon Dec 29 10:27:20 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0011</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081229181335</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.jar?rev=729962&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/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/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.pom?rev=729962&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/0.2/b-0.2.pom
Mon Dec 29 10:27:20 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.it0011</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/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml?rev=729962&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml
Mon Dec 29 10:27:20 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0011</groupId>
+ <artifactId>b</artifactId>
+ <version>0.2</version>
+ <versioning>
+ <release>0.2</release>
+ <versions>
+ <version>0.2</version>
+ </versions>
+ <lastUpdated>20081229181348</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0011/repo/org/apache/maven/its/it0011/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
