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/03/06 11:35:20 UTC
svn commit: r750840 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3814/ resources/mng-3814/plugin-a/
resources/mng-3814/plugin-a/repo/ resources/mng-3814/plugin-b/
resources/mng-3814/plugin-b...
Author: bentmann
Date: Fri Mar 6 10:35:17 2009
New Revision: 750840
URL: http://svn.apache.org/viewvc?rev=750840&view=rev
Log:
o Moved repository declarations to settings
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/
- copied from r750819, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/
- copied from r750819, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/org/apache/maven/its/mng3814/maven-mng3814a-plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/repo/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java?rev=750840&r1=750839&r2=750840&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java Fri Mar 6 10:35:17 2009
@@ -42,7 +42,7 @@
/**
* Verify that the reactor's project sorter considers artifact versions when checking for cycles.
*/
- public void testitMNG3813()
+ public void testitMNG3814()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3814" );
@@ -50,6 +50,9 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3814" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml?rev=750840&r1=750839&r2=750840&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-a/pom.xml Fri Mar 6 10:35:17 2009
@@ -33,31 +33,6 @@
<version>2.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <repositories>
- <repository>
- <id>maven-core-it</id>
- <url>file:///${basedir}/repo</url>
- <releases>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- <snapshots>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>maven-core-it</id>
- <url>file:///${basedir}/repo</url>
- <releases>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- <snapshots>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml?rev=750840&r1=750839&r2=750840&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/plugin-b/pom.xml Fri Mar 6 10:35:17 2009
@@ -33,31 +33,6 @@
<version>2.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <repositories>
- <repository>
- <id>maven-core-it</id>
- <url>file:///${basedir}/repo</url>
- <releases>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- <snapshots>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>maven-core-it</id>
- <url>file:///${basedir}/repo</url>
- <releases>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- <snapshots>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml?rev=750840&r1=750819&r2=750840&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/repo/org/apache/maven/its/mng3814/maven-metadata.xml Fri Mar 6 10:35:17 2009
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
<plugins>
<plugin>
+ <name>Unnamed - org.apache.maven.its.mng3814:maven-mng3814a-plugin:maven-plugin:1.0</name>
+ <prefix>mng3814a</prefix>
+ <artifactId>maven-mng3814a-plugin</artifactId>
+ </plugin>
+ <plugin>
<name>Unnamed - org.apache.maven.its.mng3814:maven-mng3814b-plugin:maven-plugin:1.0</name>
<prefix>mng3814b</prefix>
<artifactId>maven-mng3814b-plugin</artifactId>
</plugin>
</plugins>
-</metadata>
\ No newline at end of file
+</metadata>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml?rev=750840&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml Fri Mar 6 10:35:17 2009
@@ -0,0 +1,55 @@
+<?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>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3814/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision