Author: bentmann
Date: Mon Dec 29 09:43:03 2008
New Revision: 729957
URL: http://svn.apache.org/viewvc?rev=729957&view=rev
Log:
o Decoupled it0007 from production stuff
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java?rev=729957&r1=729956&r2=729957&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
Mon Dec 29 09:43:03 2008
@@ -36,17 +36,17 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0007" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins",
"maven-plugin-parent", "2.0", "pom" );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent(
"target/classes/org/apache/maven/it0007/Person.class" );
- verifier.assertFilePresent(
"target/test-classes/org/apache/maven/it0007/PersonTest.class" );
- verifier.assertFilePresent( "target/maven-it-it0007-1.0.jar" );
- verifier.assertFilePresent(
"target/maven-it-it0007-1.0.jar!/it0007.properties" );
- verifier.assertArtifactPresent( "org.apache.maven.plugins",
"maven-plugin-parent", "2.0", "pom" );
+ verifier.setAutoclean( false );
+ verifier.filterFile( "settings.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0007" );
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( new File( testDir, "settings.xml"
).getAbsolutePath() );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0007",
"parent", "2.0", "pom" );
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java?rev=729957&r1=729956&r2=729957&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
Mon Dec 29 09:43:03 2008
@@ -43,6 +43,7 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-1021" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
verifier.deleteDirectory( "repo" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
verifier.executeGoal( "initialize" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/pom.xml?rev=729957&r1=729956&r2=729957&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/pom.xml
Mon Dec 29 09:43:03 2008
@@ -1,22 +1,38 @@
+<?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>
- <artifactId>maven-plugin-parent</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.its.it0007</groupId>
+ <artifactId>parent</artifactId>
<version>2.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>maven-it-it0007</artifactId>
- <description>We specify a parent in the POM and make sure that it is
downloaded as
- part of the process. </description>
- <packaging>jar</packaging>
+
+ <artifactId>test</artifactId>
<version>1.0</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
+
+ <name>Maven Integration Test :: it0007</name>
+ <description>
+ Verify that a parent POM is successfully downloaded.
+ </description>
</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom?rev=729957&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
Mon Dec 29 09:43:03 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.it0007</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.0</version>
+ <packaging>pom</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/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml?rev=729957&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
Mon Dec 29 09:43:03 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0007</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.0</version>
+ <versioning>
+ <release>2.0</release>
+ <versions>
+ <version>2.0</version>
+ </versions>
+ <lastUpdated>20081229165708</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml?rev=729957&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml
Mon Dec 29 09:43:03 2008
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0007/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
