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/10 20:24:01 UTC
svn commit: r733318 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3461/test-1/
resources/mng-3461/test-3/ resources/mng-3461/test-3/repo/
resources/mng-3461/test-3/repo/org/ resources/mng-346...
Author: bentmann
Date: Sat Jan 10 11:24:01 2009
New Revision: 733318
URL: http://svn.apache.org/viewvc?rev=733318&view=rev
Log:
[MNG-3461] Enhance Mirror definition syntax
o Extended IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java?rev=733318&r1=733317&r2=733318&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java Sat Jan 10 11:24:01 2009
@@ -135,4 +135,27 @@
verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "c", "0.1", "jar" );
}
+ /**
+ * Test that mirror definitions are properly evaluated. In particular, the wildcards within a single mirrorOf
+ * spec should not be greedy.
+ */
+ public void testitNonGreedyWildcard()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3461/test-3" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", filterProps );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertArtifactPresent( "org.apache.maven.its.mng3461", "a", "0.1", "jar" );
+ }
+
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml?rev=733318&r1=733317&r2=733318&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml Sat Jan 10 11:24:01 2009
@@ -24,9 +24,10 @@
<mirror>
<id>test-a</id>
<url>@baseurl@/null0</url>
- <mirrorOf>external:*</mirrorOf>
+ <mirrorOf>*</mirrorOf>
</mirror>
<mirror>
+ <!-- NOTE: Intended match deliberately not listed first here, ordering in file should not matter for exact match -->
<id>test-b</id>
<url>@baseurl@/repo</url>
<mirrorOf>maven-core-it</mirrorOf>
@@ -34,7 +35,7 @@
<mirror>
<id>test-c</id>
<url>@baseurl@/null1</url>
- <mirrorOf>*</mirrorOf>
+ <mirrorOf>external:*</mirrorOf>
</mirror>
</mirrors>
</settings>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml?rev=733318&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml Sat Jan 10 11:24:01 2009
@@ -0,0 +1,74 @@
+<?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.mng3461</groupId>
+ <artifactId>test-3</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-3461</name>
+ <description>
+ Test that mirror definitions are properly evaluated. In particular, the wildcards within a single mirrorOf
+ spec should not be greedy.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </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>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.jar?rev=733318&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/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/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom?rev=733318&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/0.1/a-0.1.pom Sat Jan 10 11:24:01 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.mng3461</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/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml?rev=733318&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml Sat Jan 10 11:24:01 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng3461</groupId>
+ <artifactId>a</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090109112621</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/repo/org/apache/maven/its/mng3461/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml?rev=733318&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml Sat Jan 10 11:24:01 2009
@@ -0,0 +1,34 @@
+<?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>
+ <mirrors>
+ <mirror>
+ <id>test-a</id>
+ <url>http://maven.apache.org/null</url>
+ <!--
+ The explicit mismatch with maven-core-it should be dominant over the wildcard, even if the wildcard
+ is given first.
+ -->
+ <mirrorOf>*,!maven-core-it</mirrorOf>
+ </mirror>
+ </mirrors>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3461/test-3/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision