Author: jdcasey
Date: Thu Sep 10 20:06:14 2009
New Revision: 813570
URL: http://svn.apache.org/viewvc?rev=813570&view=rev
Log:
[MNG-4148] integration test to verify that the fix for MNG-4347 also fixed this
one.
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/
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
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dependencies/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/dependencies/1.0.0/
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
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/module/1.0.0/
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
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/local-repository/org/apache/maven/it/mng4148/parent/1.0.0/
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
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
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=813570&r1=813569&r2=813570&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 20:06:14 2009
@@ -41,8 +41,10 @@
/**
* Test that profiles from settings.xml will be used to resolve
import-scoped dependency POMs.
+ * 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 testit()
+ public void testMNG4347()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4347" );
@@ -60,8 +62,6 @@
verifier.setAutoclean( false );
- verifier.getCliOptions().add( "-V" );
- verifier.getCliOptions().add( "-X" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
@@ -73,4 +73,36 @@
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();
+ }
+
}
Added:
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/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar?rev=813570&view=auto
==============================================================================
Files
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
(added) and
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
Thu Sep 10 20:06:14 2009 differ
Added:
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/local-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom?rev=813570&view=auto
==============================================================================
---
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
(added)
+++
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
Thu Sep 10 20:06:14 2009
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+ <groupId>org.apache.maven.it.mng4148</groupId>
+ <artifactId>dep</artifactId>
+ <version>1.0.0</version>
+</project>
\ No newline at end of file
Propchange:
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
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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
URL:
http://svn.apache.org/viewvc/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?rev=813570&view=auto
==============================================================================
---
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
(added)
+++
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
Thu Sep 10 20:06:14 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+ <parent>
+ <groupId>org.apache.maven.it.mng4148</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+ <groupId>org.apache.maven.it.mng4148</groupId>
+ <artifactId>dependencies</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.it.mng4148</groupId>
+ <artifactId>dep</artifactId>
+ <version>${depVersion}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
\ No newline at end of file
Propchange:
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
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar?rev=813570&view=auto
==============================================================================
Files
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
(added) and
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
Thu Sep 10 20:06:14 2009 differ
Added:
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/local-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom?rev=813570&view=auto
==============================================================================
---
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
(added)
+++
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
Thu Sep 10 20:06:14 2009
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+ <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>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange:
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
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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/local-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom?rev=813570&view=auto
==============================================================================
---
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
(added)
+++
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
Thu Sep 10 20:06:14 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+ <groupId>org.apache.maven.it.mng4148</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+</project>
\ No newline at end of file
Propchange:
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
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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=813570&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml
Thu Sep 10 20:06:14 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
+ <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>
+ <artifactId>module</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
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.xml?rev=813570&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml
Thu Sep 10 20:06:14 2009
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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";>
+ <profiles>
+ <profile>
+ <id>inject-properties</id>
+ <properties>
+ <depVersion>1.2.2</depVersion>
+ </properties>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>inject-properties</activeProfile>
+ </activeProfiles>
+</settings>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4148/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
