You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/09/11 00:08:23 UTC
svn commit: r813617 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-4148/
resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/
resources/mng-4148/local-repository/org/apac...
Author: jdcasey
Date: Thu Sep 10 22:08:22 2009
New Revision: 813617
URL: http://svn.apache.org/viewvc?rev=813617&view=rev
Log:
[MNG-4148] Moving out into a separate IT from MNG-4347, and using a remote repository instead of a local repo directory structure to be copied in. This hopefully future-proofs the IT from changes in the local repo structure.
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar
- copied, changed from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom (contents, props changed)
- copied, changed from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar
- copied, changed from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom (contents, props changed)
- copied, changed from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom (contents, props changed)
- copied, changed from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings-template.xml (contents, props changed)
- copied, changed from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dependencies/1.0.0/dependencies-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=813617&r1=813616&r2=813617&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Thu Sep 10 22:08:22 2009
@@ -138,6 +138,7 @@
suite.addTestSuite( MavenITmng4172EmptyDependencySetTest.class );
suite.addTestSuite( MavenITmng4166HideCoreCommonsCliTest.class );
suite.addTestSuite( MavenITmng4150VersionRangeTest.class );
+ suite.addTestSuite( MavenITmng4148DepPomInterpWithSettingsProfilesTest.class );
suite.addTestSuite( MavenITmng4129PluginExecutionInheritanceTest.class );
suite.addTestSuite( MavenITmng4126ParentProfilesXmlTest.class );
suite.addTestSuite( MavenITmng4116UndecodedUrlsTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java?rev=813617&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java Thu Sep 10 22:08:22 2009
@@ -0,0 +1,68 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4148">MNG-4148</a>.
+ *
+ * @author John Casey
+ */
+public class MavenITmng4148DepPomInterpWithSettingsProfilesTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4148DepPomInterpWithSettingsProfilesTest()
+ {
+ super( "(2.2.1,]" );
+ }
+
+ /**
+ * Test that a property from the settings profile that used in the
+ * version for a dependency is interpolated when the spec is a transitive dependency
+ * (declared in the POM of a direct dependency of the current project).
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4148" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.it.mng4148" );
+
+ verifier.setAutoclean( false );
+
+ verifier.getCliOptions().add( "-s" );
+ verifier.getCliOptions().add( "settings.xml" );
+
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+
+ verifier.executeGoal( "validate" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java?rev=813617&r1=813616&r2=813617&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java Thu Sep 10 22:08:22 2009
@@ -44,7 +44,7 @@
* In this case, the settings profile enables snapshot resolution on the central repository, which
* is required to resolve the import-scoped POM with a SNAPSHOT version.
*/
- public void testMNG4347()
+ public void testit()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4347" );
@@ -72,37 +72,4 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
-
- /**
- * Test that profiles from settings.xml will be used to resolve import-scoped dependency POMs.
- * In this case, it's a property from the settings profile that needs to be used to resolve the
- * version for a dependency in the import-scoped POM.
- */
- public void testMNG4148()
- throws Exception
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4148" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
- String localRepo = verifier.localRepo;
- File dest = new File( localRepo );
- File src = new File( testDir, "local-repository" );
-
- verifier.deleteDirectory( "target" );
- verifier.deleteArtifacts( "org.apache.maven.it.mng4148" );
-
- FileUtils.copyDirectoryStructure( src, dest );
-
- verifier.setAutoclean( false );
-
- verifier.getCliOptions().add( "-s" );
- 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-4148/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml?rev=813617&r1=813616&r2=813617&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml Thu Sep 10 22:08:22 2009
@@ -4,6 +4,7 @@
<groupId>org.apache.maven.it.mng4148</groupId>
<artifactId>mng-4148</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.it.mng4148</groupId>
@@ -11,4 +12,23 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
+ <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>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar (from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar&r1=813571&r2=813617&rev=813617&view=diff
==============================================================================
(empty)
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom (from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom&r1=813571&r2=813617&rev=813617&view=diff
==============================================================================
(empty)
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar (from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar&r1=813571&r2=813617&rev=813617&view=diff
==============================================================================
(empty)
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom (from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom&r1=813571&r2=813617&rev=813617&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom Thu Sep 10 22:08:22 2009
@@ -4,21 +4,11 @@
<groupId>org.apache.maven.it.mng4148</groupId>
<artifactId>module</artifactId>
<version>1.0.0</version>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>dependencies</artifactId>
- <version>1.0.0</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.it.mng4148</groupId>
<artifactId>dep</artifactId>
+ <version>${depVersion}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom (from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom&r1=813571&r2=813617&rev=813617&view=diff
==============================================================================
(empty)
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings-template.xml (from r813571, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings-template.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings-template.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml&r1=813571&r2=813617&rev=813617&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings-template.xml Thu Sep 10 22:08:22 2009
@@ -2,15 +2,23 @@
<settings 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/xsd/settings-1.0.0.xsd">
+ <mirrors>
+ <mirror>
+ <id>test</id>
+ <mirrorOf>external:*</mirrorOf>
+ <url>@baseurl@/remote-repository</url>
+ </mirror>
+ </mirrors>
+
<profiles>
<profile>
- <id>inject-properties</id>
+ <id>inject</id>
<properties>
- <depVersion>1.2.2</depVersion>
+ <depVersion>1.0.0</depVersion>
</properties>
</profile>
</profiles>
<activeProfiles>
- <activeProfile>inject-properties</activeProfile>
+ <activeProfile>inject</activeProfile>
</activeProfiles>
</settings>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native