Author: bentmann
Date: Mon Mar 15 19:33:04 2010
New Revision: 923399
URL: http://svn.apache.org/viewvc?rev=923399&view=rev
Log:
[MNG-4590] [regression] System properties are no longer interpolated in
imported POMs
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
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=923399&r1=923398&r2=923399&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
Mon Mar 15 19:33:04 2010
@@ -85,6 +85,7 @@ public class IntegrationTestSuite
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite(
MavenITmng4590ImportedPomUsesSystemPropertiesTest.class );
suite.addTestSuite(
MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.class );
suite.addTestSuite(
MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.class );
suite.addTestSuite(
MavenITmng4572ModelVersionSurroundedByWhitespaceTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java?rev=923399&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
Mon Mar 15 19:33:04 2010
@@ -0,0 +1,70 @@
+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.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-4590";>MNG-4590</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4590ImportedPomUsesSystemPropertiesTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4590ImportedPomUsesSystemPropertiesTest()
+ {
+ super( "[2.0.9,3.0-alpha-1),[3.0-alpha-8,)" );
+ }
+
+ /**
+ * Verify that imported POMs are processed using the same execution
properties as the importing POM.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4590" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4590" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
+ verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dtest.file=pom.xml" );
+ verifier.setSystemProperty( "test.dir", testDir.getAbsolutePath() );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties( "target/pom.properties" );
+ assertEquals( "1", props.getProperty(
"project.dependencyManagement.dependencies" ) );
+ assertEquals( "dep-a", props.getProperty(
"project.dependencyManagement.dependencies.0.artifactId" ) );
+ assertEquals( new File( testDir, "pom.xml" ).getAbsoluteFile(),
+ new File( props.getProperty(
"project.dependencyManagement.dependencies.0.systemPath" ) ) );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml?rev=923399&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml
Mon Mar 15 19:33:04 2010
@@ -0,0 +1,71 @@
+<?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.mng4590</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-4590</name>
+ <description>
+ Verify that imported POMs are processed using the same execution
properties as the importing POM.
+ </description>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4590</groupId>
+ <artifactId>import</artifactId>
+ <version>0.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <configuration>
+ <expressions>
+
<expression>project/dependencyManagement/dependencies</expression>
+ </expressions>
+ <outputFile>target/pom.properties</outputFile>
+ </configuration>
+ <goals>
+ <goal>eval</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom?rev=923399&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
Mon Mar 15 19:33:04 2010
@@ -0,0 +1,49 @@
+<?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.mng4590</groupId>
+ <artifactId>import</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4590</name>
+ <description>
+ Verify that imported POMs are processed using the same execution
properties as the importing POM.
+ </description>
+
+ <properties>
+ <test.version>0.1</test.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4590</groupId>
+ <artifactId>dep-a</artifactId>
+ <version>0.1</version>
+ <scope>system</scope>
+ <systemPath>${test.dir}/${test.file}</systemPath>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml?rev=923399&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml
Mon Mar 15 19:33:04 2010
@@ -0,0 +1,43 @@
+<?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>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4590/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
