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 2008/11/28 18:15:26 UTC
svn commit: r721538 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0068/ resources/it0068/repo-0/
resources/it0068/repo-0/org/ resources/it0068/repo-0/org/apache/
resources/it0068/repo-0/org/apa...
Author: bentmann
Date: Fri Nov 28 09:15:26 2008
New Revision: 721538
URL: http://svn.apache.org/viewvc?rev=721538&view=rev
Log:
o Decoupled it0068 from Modello Plugin
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/0.1/parent-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/test.mdo
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0068Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0068Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0068Test.java?rev=721538&r1=721537&r2=721538&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0068Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0068Test.java Fri Nov 28 09:15:26 2008
@@ -25,27 +25,33 @@
import java.io.File;
import java.util.Properties;
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-836">MNG-836</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
public class MavenIT0068Test
extends AbstractMavenIntegrationTestCase
{
/**
- * Test repository accumulation.
+ * Test that parent POMs referenced by a plugin POM can be resolved from ordinary repos, i.e. non-plugin repos.
+ * As a motivation for this, imagine the plugin repository hosts only snapshots while the ordinary repository
+ * hosts releases and a snapshot plugin might easily use a released parent.
*/
- public void testit0068()
+ public void testitMNG836()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0068" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.codehaus.modello", "modello-core", "1.0-alpha-3", "jar" );
- Properties verifierProperties = new Properties();
- verifierProperties.put( "failOnErrorOutput", "false" );
- verifier.setVerifierProperties( verifierProperties );
- verifier.executeGoal( "generate-sources" );
- verifier.assertFilePresent( "target/generated-sources/modello/org/apache/maven/settings/Settings.java" );
-// don't verify error free log
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng836" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/pom.xml?rev=721538&r1=721537&r2=721538&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/pom.xml Fri Nov 28 09:15:26 2008
@@ -1,28 +1,83 @@
+<?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 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>
- <name>Maven Integration Test :: it0068</name>
- <groupId>org.apache.maven.its.it0068</groupId>
- <artifactId>maven-it-it0068</artifactId>
- <description>Test repository accumulation.</description>
+ <groupId>org.apache.maven.its.mng836</groupId>
+ <artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: MNG-836</name>
+ <description>
+ Test that parent POMs referenced by a plugin POM can be resolved from ordinary repos, i.e. non-plugin repos.
+ As a motivation for this, imagine the plugin repository hosts only snapshots while the ordinary repository
+ hosts releases and a snapshot plugin might easily use a released parent.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it-repo-0</id>
+ <url>file:///${basedir}/repo-0</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-core-it-repo-1</id>
+ <url>file:///${basedir}/repo-1</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-7</version>
+ <!--
+ The POM for this plugin references a parent POM which is not hosted in the <pluginRepository> but in the
+ ordinary <repository>.
+ -->
+ <groupId>org.apache.maven.its.mng836</groupId>
+ <artifactId>plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
<executions>
<execution>
+ <id>test</id>
+ <phase>validate</phase>
<goals>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
+ <goal>touch</goal>
</goals>
<configuration>
- <version>1.0.0</version>
- <model>test.mdo</model>
- <packageWithVersion>false</packageWithVersion>
+ <file>target/test.txt</file>
</configuration>
</execution>
</executions>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/0.1/parent-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/0.1/parent-0.1.pom?rev=721538&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/0.1/parent-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/0.1/parent-0.1.pom Fri Nov 28 09:15:26 2008
@@ -0,0 +1,65 @@
+<?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.mng836</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml?rev=721538&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml Fri Nov 28 09:15:26 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng836</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081128163134</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-0/org/apache/maven/its/mng836/parent/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml?rev=721538&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml Fri Nov 28 09:15:26 2008
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <plugins>
+ <plugin>
+ <name>Unnamed - org.apache.maven.its.mng836:plugin:maven-plugin:0.1-SNAPSHOT</name>
+ <prefix></prefix>
+ <artifactId>plugin</artifactId>
+ </plugin>
+ </plugins>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml?rev=721538&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml Fri Nov 28 09:15:26 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng836</groupId>
+ <artifactId>plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <buildNumber>1</buildNumber>
+ </snapshot>
+ <lastUpdated>20081128163159</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.jar?rev=721538&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.pom?rev=721538&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/0.1-SNAPSHOT/plugin-0.1-SNAPSHOT.pom Fri Nov 28 09:15:26 2008
@@ -0,0 +1,70 @@
+<?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.mng836</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng836</groupId>
+ <artifactId>plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <uniqueVersion>false</uniqueVersion>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <!-- NOTE: Version managed from parent to make sure this build does not silently pass with a stub parent model. -->
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml?rev=721538&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml Fri Nov 28 09:15:26 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng836</groupId>
+ <artifactId>plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <latest>0.1-SNAPSHOT</latest>
+ <versions>
+ <version>0.1-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20081128163159</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0068/repo-1/org/apache/maven/its/mng836/plugin/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision