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 15:20:06 UTC
svn commit: r731947 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0021/ resources/it0021/repo/
resources/it0021/repo/org/ resources/it0021/repo/org/apache/
resources/it0021/repo/org/apache/mave...
Author: bentmann
Date: Tue Jan 6 06:20:04 2009
New Revision: 731947
URL: http://svn.apache.org/viewvc?rev=731947&view=rev
Log:
o Decoupled it0021 from production plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021Test.java?rev=731947&r1=731946&r2=731947&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021Test.java Tue Jan 6 06:20:04 2009
@@ -23,7 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Properties;
public class MavenIT0021Test
extends AbstractMavenIntegrationTestCase
@@ -37,16 +36,18 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0021" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
- Properties systemProperties = new Properties();
- systemProperties.put( "includeProfile", "true" );
- verifier.setSystemProperties( systemProperties );
- verifier.executeGoal( "compile" );
- verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0021" );
+ verifier.getSystemProperties().setProperty( "includeProfile", "true" );
+ verifier.getCliOptions().add( "-Pprofile-2" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0021", "a", "0.1", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0021", "b", "0.1", "jar" );
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/pom.xml?rev=731947&r1=731946&r2=731947&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/pom.xml Tue Jan 6 06:20:04 2009
@@ -1,37 +1,94 @@
+<?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 :: it0021</name>
+
<groupId>org.apache.maven.its.it0021</groupId>
- <artifactId>maven-it-it0021</artifactId>
- <description>Test pom-level profile inclusion (this one is activated by system
- property).</description>
+ <artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
-
+
+ <name>Maven Integration Test :: it0021</name>
+ <description>
+ Test pom-level profile inclusion (this one is activated by system property).
+ </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>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
- <id>test-profile</id>
-
+ <id>profile-1</id>
<activation>
<property>
<name>includeProfile</name>
</property>
</activation>
-
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core-it-support</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.maven.its.it0021</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>profile-2</id>
+ <!-- to be activated explicitly on the CLI by its id -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0021</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
</dependency>
</dependencies>
</profile>
</profiles>
-
- <distributionManagement>
- <repository>
- <id>central</id>
- <name>Test Repository</name>
- <url>file:/tmp/testRepo</url>
- </repository>
- </distributionManagement>
</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.jar?rev=731947&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/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/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.pom?rev=731947&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/0.1/a-0.1.pom Tue Jan 6 06:20:04 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.it0021</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>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml?rev=731947&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml Tue Jan 6 06:20:04 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0021</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090106132946</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.jar?rev=731947&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.pom?rev=731947&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/0.1/b-0.1.pom Tue Jan 6 06:20:04 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.it0021</groupId>
+ <artifactId>b</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/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml?rev=731947&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml Tue Jan 6 06:20:04 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0021</groupId>
+ <artifactId>b</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090106141033</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0021/repo/org/apache/maven/its/it0021/b/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision