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 2008/10/14 19:08:44 UTC

svn commit: r704581 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0139/ resources/it0139/child/ resources/it0140/ resources/it0140/child/ resources/it0141/ resources/it0141/child/

Author: bentmann
Date: Tue Oct 14 10:08:43 2008
New Revision: 704581

URL: http://svn.apache.org/viewvc?rev=704581&view=rev
Log:
o Added some more ITs to check POM interpolation

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml   (with props)
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.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=704581&r1=704580&r2=704581&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 Tue Oct 14 10:08:43 2008
@@ -151,6 +151,9 @@
         suite.addTestSuite( MavenITmng1491ReactorArtifactIdCollision.class );
         suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class );
         suite.addTestSuite( MavenITmng0469Test.class );
+        suite.addTestSuite( MavenIT0141Test.class );
+        suite.addTestSuite( MavenIT0140Test.class );
+        suite.addTestSuite( MavenIT0139Test.class );
         suite.addTestSuite( MavenIT0138PluginLifecycleTest.class );
         suite.addTestSuite( MavenIT0137EarLifecycleTest.class );
         suite.addTestSuite( MavenIT0136RarLifecycleTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java Tue Oct 14 10:08:43 2008
@@ -0,0 +1,85 @@
+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;
+
+/**
+ * 
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenIT0139Test
+    extends AbstractMavenIntegrationTestCase
+{
+
+    /**
+     * Test that expressions of the form ${project.*} resolve correctly to POM values.
+     */
+    public void testit0139()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0139" );
+        File child = new File( testDir, "child" );
+
+        Verifier verifier = new Verifier( child.getAbsolutePath() );
+        verifier.executeGoal( "initialize" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        Properties props = verifier.loadProperties( "target/interpolated.properties" );
+        String prefix = "project.properties.";
+
+        assertEquals( child.getCanonicalFile(), new File( props.getProperty( prefix + "projectDir" ) ).getCanonicalFile() );
+
+        assertEquals( "org.apache.maven.its.it0139.child", props.getProperty( prefix + "projectGroupId" ) );
+        assertEquals( "child", props.getProperty( prefix + "projectArtifactId" ) );
+        assertEquals( "2.0-alpha-1", props.getProperty( prefix + "projectVersion" ) );
+        assertEquals( "jar", props.getProperty( prefix + "projectPackaging" ) );
+
+        assertEquals( "child-name", props.getProperty( prefix + "projectName" ) );
+        assertEquals( "child-desc", props.getProperty( prefix + "projectDesc" ) );
+        assertEquals( "http://child.org/", props.getProperty( prefix + "projectUrl" ) );
+        assertEquals( "2008", props.getProperty( prefix + "projectYear" ) );
+        assertEquals( "child-org-name", props.getProperty( prefix + "projectOrgName" ) );
+
+        assertEquals( "2.0.0", props.getProperty( prefix + "projectPrereqMvn" ) );
+        assertEquals( "http://scm.org/", props.getProperty( prefix + "projectScmUrl" ) );
+        assertEquals( "http://issue.org/", props.getProperty( prefix + "projectIssueUrl" ) );
+        assertEquals( "http://ci.org/", props.getProperty( prefix + "projectCiUrl" ) );
+        assertEquals( "child-dist-repo", props.getProperty( prefix + "projectDistRepoName" ) );
+
+        assertEquals( "org.apache.maven.its.it0139", props.getProperty( prefix + "parentGroupId" ) );
+        assertEquals( "parent", props.getProperty( prefix + "parentArtifactId" ) );
+        assertEquals( "1.0", props.getProperty( prefix + "parentVersion" ) );
+
+        /*
+         * NOTE: We intentionally do not check whether the build paths have been basedir aligned, that's another
+         * story...
+         */
+        assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+        assertTrue( props.getProperty( prefix + "projectSiteOut" ).endsWith( "doc" ) );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139Test.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java Tue Oct 14 10:08:43 2008
@@ -0,0 +1,85 @@
+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;
+
+/**
+ * 
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenIT0140Test
+    extends AbstractMavenIntegrationTestCase
+{
+
+    /**
+     * Test that expressions of the form ${pom.*} resolve correctly to POM values.
+     */
+    public void testit0140()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0140" );
+        File child = new File( testDir, "child" );
+
+        Verifier verifier = new Verifier( child.getAbsolutePath() );
+        verifier.executeGoal( "initialize" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        Properties props = verifier.loadProperties( "target/interpolated.properties" );
+        String prefix = "project.properties.";
+
+        assertEquals( child.getCanonicalFile(), new File( props.getProperty( prefix + "projectDir" ) ).getCanonicalFile() );
+
+        assertEquals( "org.apache.maven.its.it0140.child", props.getProperty( prefix + "projectGroupId" ) );
+        assertEquals( "child", props.getProperty( prefix + "projectArtifactId" ) );
+        assertEquals( "2.0-alpha-1", props.getProperty( prefix + "projectVersion" ) );
+        assertEquals( "jar", props.getProperty( prefix + "projectPackaging" ) );
+
+        assertEquals( "child-name", props.getProperty( prefix + "projectName" ) );
+        assertEquals( "child-desc", props.getProperty( prefix + "projectDesc" ) );
+        assertEquals( "http://child.org/", props.getProperty( prefix + "projectUrl" ) );
+        assertEquals( "2008", props.getProperty( prefix + "projectYear" ) );
+        assertEquals( "child-org-name", props.getProperty( prefix + "projectOrgName" ) );
+
+        assertEquals( "2.0.0", props.getProperty( prefix + "projectPrereqMvn" ) );
+        assertEquals( "http://scm.org/", props.getProperty( prefix + "projectScmUrl" ) );
+        assertEquals( "http://issue.org/", props.getProperty( prefix + "projectIssueUrl" ) );
+        assertEquals( "http://ci.org/", props.getProperty( prefix + "projectCiUrl" ) );
+        assertEquals( "child-dist-repo", props.getProperty( prefix + "projectDistRepoName" ) );
+
+        assertEquals( "org.apache.maven.its.it0140", props.getProperty( prefix + "parentGroupId" ) );
+        assertEquals( "parent", props.getProperty( prefix + "parentArtifactId" ) );
+        assertEquals( "1.0", props.getProperty( prefix + "parentVersion" ) );
+
+        /*
+         * NOTE: We intentionally do not check whether the build paths have been basedir aligned, that's another
+         * story...
+         */
+        assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+        assertTrue( props.getProperty( prefix + "projectSiteOut" ).endsWith( "doc" ) );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140Test.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java Tue Oct 14 10:08:43 2008
@@ -0,0 +1,85 @@
+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;
+
+/**
+ * 
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenIT0141Test
+    extends AbstractMavenIntegrationTestCase
+{
+
+    /**
+     * Test that expressions of the form ${*} resolve correctly to POM values (ugly but real).
+     */
+    public void testit0141()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0141" );
+        File child = new File( testDir, "child" );
+
+        Verifier verifier = new Verifier( child.getAbsolutePath() );
+        verifier.executeGoal( "initialize" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        Properties props = verifier.loadProperties( "target/interpolated.properties" );
+        String prefix = "project.properties.";
+
+        assertEquals( child.getCanonicalFile(), new File( props.getProperty( prefix + "projectDir" ) ).getCanonicalFile() );
+
+        assertEquals( "org.apache.maven.its.it0141.child", props.getProperty( prefix + "projectGroupId" ) );
+        assertEquals( "child", props.getProperty( prefix + "projectArtifactId" ) );
+        assertEquals( "2.0-alpha-1", props.getProperty( prefix + "projectVersion" ) );
+        assertEquals( "jar", props.getProperty( prefix + "projectPackaging" ) );
+
+        assertEquals( "child-name", props.getProperty( prefix + "projectName" ) );
+        assertEquals( "child-desc", props.getProperty( prefix + "projectDesc" ) );
+        assertEquals( "http://child.org/", props.getProperty( prefix + "projectUrl" ) );
+        assertEquals( "2008", props.getProperty( prefix + "projectYear" ) );
+        assertEquals( "child-org-name", props.getProperty( prefix + "projectOrgName" ) );
+
+        assertEquals( "2.0.0", props.getProperty( prefix + "projectPrereqMvn" ) );
+        assertEquals( "http://scm.org/", props.getProperty( prefix + "projectScmUrl" ) );
+        assertEquals( "http://issue.org/", props.getProperty( prefix + "projectIssueUrl" ) );
+        assertEquals( "http://ci.org/", props.getProperty( prefix + "projectCiUrl" ) );
+        assertEquals( "child-dist-repo", props.getProperty( prefix + "projectDistRepoName" ) );
+
+        assertEquals( "org.apache.maven.its.it0141", props.getProperty( prefix + "parentGroupId" ) );
+        assertEquals( "parent", props.getProperty( prefix + "parentArtifactId" ) );
+        assertEquals( "1.0", props.getProperty( prefix + "parentVersion" ) );
+
+        /*
+         * NOTE: We intentionally do not check whether the build paths have been basedir aligned, that's another
+         * story...
+         */
+        assertTrue( props.getProperty( prefix + "projectBuildOut" ).endsWith( "bin" ) );
+        assertTrue( props.getProperty( prefix + "projectSiteOut" ).endsWith( "doc" ) );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml Tue Oct 14 10:08:43 2008
@@ -0,0 +1,118 @@
+<?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 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.its.it0139</groupId>
+     <artifactId>parent</artifactId>
+     <version>1.0</version>
+  </parent>
+
+  <groupId>org.apache.maven.its.it0139.child</groupId>
+  <artifactId>child</artifactId>
+  <version>2.0-alpha-1</version>
+  <packaging>jar</packaging>
+
+  <name>child-name</name>
+  <description>child-desc</description>
+  <url>http://child.org/</url>
+  <inceptionYear>2008</inceptionYear>
+  <organization>
+    <name>child-org-name</name>
+  </organization>
+
+  <prerequisites>
+    <maven>2.0.0</maven>
+  </prerequisites>
+
+  <scm>
+    <url>http://scm.org/</url>
+  </scm>
+  <issueManagement>
+    <url>http://issue.org/</url>
+  </issueManagement>
+  <ciManagement>
+    <url>http://ci.org/</url>
+  </ciManagement>
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <name>child-dist-repo</name>
+      <url>http://dist.org/</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <!-- this is where we collect all the interpolated values for the POM dump -->
+    <projectDir>${basedir}</projectDir>
+    <projectGroupId>${project.groupId}</projectGroupId>
+    <projectArtifactId>${project.artifactId}</projectArtifactId>
+    <projectVersion>${project.version}</projectVersion>
+    <projectPackaging>${project.packaging}</projectPackaging>
+    <projectName>${project.name}</projectName>
+    <projectDesc>${project.description}</projectDesc>
+    <projectUrl>${project.url}</projectUrl>
+    <projectYear>${project.inceptionYear}</projectYear>
+    <projectOrgName>${project.organization.name}</projectOrgName>
+    <projectPrereqMvn>${project.prerequisites.maven}</projectPrereqMvn>
+    <projectScmUrl>${project.scm.url}</projectScmUrl>
+    <projectIssueUrl>${project.issueManagement.url}</projectIssueUrl>
+    <projectCiUrl>${project.ciManagement.url}</projectCiUrl>
+    <projectDistRepoName>${project.distributionManagement.repository.name}</projectDistRepoName>
+    <projectBuildOut>${project.build.outputDirectory}</projectBuildOut>
+    <projectSiteOut>${project.reporting.outputDirectory}</projectSiteOut>
+    <parentGroupId>${project.parent.groupId}</parentGroupId>
+    <parentArtifactId>${project.parent.artifactId}</parentArtifactId>
+    <parentVersion>${project.parent.version}</parentVersion>
+  </properties>
+
+  <build>
+    <outputDirectory>target/bin</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-expression</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <goals>
+              <goal>eval</goal>
+            </goals>
+            <configuration>
+              <outputFile>target/interpolated.properties</outputFile>
+              <expressions>
+                <expression>project/properties</expression>
+              </expressions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <outputDirectory>target/doc</outputDirectory>
+  </reporting>
+            
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/child/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml Tue Oct 14 10:08:43 2008
@@ -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 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.its.it0139</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: it0139</name> 
+  <description>Test POM interpolation with expressions of the form $ { project.* }</description>
+
+  <modules>
+    <module>parent/child</module>
+  </modules>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0139/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml Tue Oct 14 10:08:43 2008
@@ -0,0 +1,118 @@
+<?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 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.its.it0140</groupId>
+     <artifactId>parent</artifactId>
+     <version>1.0</version>
+  </parent>
+
+  <groupId>org.apache.maven.its.it0140.child</groupId>
+  <artifactId>child</artifactId>
+  <version>2.0-alpha-1</version>
+  <packaging>jar</packaging>
+
+  <name>child-name</name>
+  <description>child-desc</description>
+  <url>http://child.org/</url>
+  <inceptionYear>2008</inceptionYear>
+  <organization>
+    <name>child-org-name</name>
+  </organization>
+
+  <prerequisites>
+    <maven>2.0.0</maven>
+  </prerequisites>
+
+  <scm>
+    <url>http://scm.org/</url>
+  </scm>
+  <issueManagement>
+    <url>http://issue.org/</url>
+  </issueManagement>
+  <ciManagement>
+    <url>http://ci.org/</url>
+  </ciManagement>
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <name>child-dist-repo</name>
+      <url>http://dist.org/</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <!-- this is where we collect all the interpolated values for the POM dump -->
+    <projectDir>${basedir}</projectDir>
+    <projectGroupId>${pom.groupId}</projectGroupId>
+    <projectArtifactId>${pom.artifactId}</projectArtifactId>
+    <projectVersion>${pom.version}</projectVersion>
+    <projectPackaging>${pom.packaging}</projectPackaging>
+    <projectName>${pom.name}</projectName>
+    <projectDesc>${pom.description}</projectDesc>
+    <projectUrl>${pom.url}</projectUrl>
+    <projectYear>${pom.inceptionYear}</projectYear>
+    <projectOrgName>${pom.organization.name}</projectOrgName>
+    <projectPrereqMvn>${pom.prerequisites.maven}</projectPrereqMvn>
+    <projectScmUrl>${pom.scm.url}</projectScmUrl>
+    <projectIssueUrl>${pom.issueManagement.url}</projectIssueUrl>
+    <projectCiUrl>${pom.ciManagement.url}</projectCiUrl>
+    <projectDistRepoName>${pom.distributionManagement.repository.name}</projectDistRepoName>
+    <projectBuildOut>${pom.build.outputDirectory}</projectBuildOut>
+    <projectSiteOut>${pom.reporting.outputDirectory}</projectSiteOut>
+    <parentGroupId>${pom.parent.groupId}</parentGroupId>
+    <parentArtifactId>${pom.parent.artifactId}</parentArtifactId>
+    <parentVersion>${pom.parent.version}</parentVersion>
+  </properties>
+
+  <build>
+    <outputDirectory>target/bin</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-expression</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <goals>
+              <goal>eval</goal>
+            </goals>
+            <configuration>
+              <outputFile>target/interpolated.properties</outputFile>
+              <expressions>
+                <expression>project/properties</expression>
+              </expressions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <outputDirectory>target/doc</outputDirectory>
+  </reporting>
+            
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/child/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml Tue Oct 14 10:08:43 2008
@@ -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 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.its.it0140</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: it0140</name> 
+  <description>Test POM interpolation with expressions of the form $ { pom.* }</description>
+
+  <modules>
+    <module>parent/child</module>
+  </modules>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0140/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml Tue Oct 14 10:08:43 2008
@@ -0,0 +1,118 @@
+<?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 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.its.it0141</groupId>
+     <artifactId>parent</artifactId>
+     <version>1.0</version>
+  </parent>
+
+  <groupId>org.apache.maven.its.it0141.child</groupId>
+  <artifactId>child</artifactId>
+  <version>2.0-alpha-1</version>
+  <packaging>jar</packaging>
+
+  <name>child-name</name>
+  <description>child-desc</description>
+  <url>http://child.org/</url>
+  <inceptionYear>2008</inceptionYear>
+  <organization>
+    <name>child-org-name</name>
+  </organization>
+
+  <prerequisites>
+    <maven>2.0.0</maven>
+  </prerequisites>
+
+  <scm>
+    <url>http://scm.org/</url>
+  </scm>
+  <issueManagement>
+    <url>http://issue.org/</url>
+  </issueManagement>
+  <ciManagement>
+    <url>http://ci.org/</url>
+  </ciManagement>
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <name>child-dist-repo</name>
+      <url>http://dist.org/</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <!-- this is where we collect all the interpolated values for the POM dump -->
+    <projectDir>${basedir}</projectDir>
+    <projectGroupId>${groupId}</projectGroupId>
+    <projectArtifactId>${artifactId}</projectArtifactId>
+    <projectVersion>${version}</projectVersion>
+    <projectPackaging>${packaging}</projectPackaging>
+    <projectName>${name}</projectName>
+    <projectDesc>${description}</projectDesc>
+    <projectUrl>${url}</projectUrl>
+    <projectYear>${inceptionYear}</projectYear>
+    <projectOrgName>${organization.name}</projectOrgName>
+    <projectPrereqMvn>${prerequisites.maven}</projectPrereqMvn>
+    <projectScmUrl>${scm.url}</projectScmUrl>
+    <projectIssueUrl>${issueManagement.url}</projectIssueUrl>
+    <projectCiUrl>${ciManagement.url}</projectCiUrl>
+    <projectDistRepoName>${distributionManagement.repository.name}</projectDistRepoName>
+    <projectBuildOut>${build.outputDirectory}</projectBuildOut>
+    <projectSiteOut>${reporting.outputDirectory}</projectSiteOut>
+    <parentGroupId>${parent.groupId}</parentGroupId>
+    <parentArtifactId>${parent.artifactId}</parentArtifactId>
+    <parentVersion>${parent.version}</parentVersion>
+  </properties>
+
+  <build>
+    <outputDirectory>target/bin</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-expression</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <goals>
+              <goal>eval</goal>
+            </goals>
+            <configuration>
+              <outputFile>target/interpolated.properties</outputFile>
+              <expressions>
+                <expression>project/properties</expression>
+              </expressions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <outputDirectory>target/doc</outputDirectory>
+  </reporting>
+            
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/child/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.xml?rev=704581&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.xml Tue Oct 14 10:08:43 2008
@@ -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 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.its.it0141</groupId>
+  <artifactId>parent</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: it0141</name> 
+  <description>Test POM interpolation with expressions of the form $ { * } (ugly but real)</description>
+
+  <modules>
+    <module>parent/child</module>
+  </modules>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision