Author: bentmann
Date: Fri Oct 10 05:38:40 2008
New Revision: 703439
URL: http://svn.apache.org/viewvc?rev=703439&view=rev
Log:
o Decoupled it0100 from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/child/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/child/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java?rev=703439&r1=703438&r2=703439&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java
Fri Oct 10 05:38:40 2008
@@ -23,8 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Properties;
public class MavenIT0100Test
extends AbstractMavenIntegrationTestCase
@@ -40,21 +39,12 @@
File child = new File( testDir, "parent/child" );
Verifier verifier = new Verifier( child.getAbsolutePath() );
-
- List options = new ArrayList();
- options.add( "-Doutput=\"" + new File( child,
"target/effective-pom.txt" ).getAbsolutePath() + "\"" );
-
- verifier.setCliOptions( options );
-
- List goals = new ArrayList();
- goals.add(
"org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" );
- goals.add( "verify" );
-
- verifier.executeGoals( goals );
-
+ verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+
+ Properties props = verifier.loadProperties( "target/parent.properties"
);
+ assertEquals( "parent, child, parent, child", props.getProperty(
"project.description" ) );
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/child/pom.xml?rev=703439&r1=703438&r2=703439&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/child/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/child/pom.xml
Fri Oct 10 05:38:40 2008
@@ -1,5 +1,26 @@
-<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";>
+<?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>
<artifactId>parent</artifactId>
@@ -7,38 +28,30 @@
<version>1.0</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>child</artifactId>
- <name>child</name>
-
<packaging>pom</packaging>
+ <name>child</name>
+ <description>${pom.parent.artifactId}, ${pom.artifactId},
${parent.artifactId}, ${pom.artifactId}</description>
+
<build>
<plugins>
- <!--
<plugin>
- <artifactId>maven-help-plugin</artifactId>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
<executions>
<execution>
- <configuration>
- <output>target/effective-pom.txt</output>
- </configuration>
<phase>initialize</phase>
<goals>
- <goal>effective-pom</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <artifactId>maven-verifier-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
+ <goal>eval</goal>
</goals>
+ <configuration>
+
<outputFile>target/${project.parent.artifactId}.properties</outputFile>
+ <expressions>
+ <expression>project/description</expression>
+ </expressions>
+ </configuration>
</execution>
</executions>
</plugin>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/pom.xml?rev=703439&r1=703438&r2=703439&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/parent/pom.xml
Fri Oct 10 05:38:40 2008
@@ -1,32 +1,32 @@
-<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";>
+<?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.it0100</groupId>
<artifactId>parent</artifactId>
- <packaging>pom</packaging>
<version>1.0</version>
- <name>parent</name>
+ <packaging>pom</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <echo>Parent: ${pom.parent.artifactId}, project: ${pom.artifactId}</echo>
- <echo>Parent: ${parent.artifactId}, project: ${pom.artifactId}</echo>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <name>parent</name>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/pom.xml?rev=703439&r1=703438&r2=703439&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0100/pom.xml
Fri Oct 10 05:38:40 2008
@@ -1,12 +1,35 @@
-<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";>
+<?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>
- <name>Maven Integration Test :: it0100</name>
+
<groupId>org.apache.maven.its.it0100</groupId>
<artifactId>maven-it-it0100</artifactId>
- <description>Test that ${parent.artifactId} resolves correctly.
[MNG-2124]</description>
- <packaging>pom</packaging>
<version>1.0</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: it0100</name>
+ <description>Test that ${parent.artifactId} resolves correctly.
[MNG-2124]</description>
+
<modules>
<module>parent/child</module>
</modules>
