Author: bentmann
Date: Sat Oct 4 13:02:43 2008
New Revision: 701705
URL: http://svn.apache.org/viewvc?rev=701705&view=rev
Log:
o Decoupled it0075 from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub1/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub2/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub1/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub2/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java?rev=701705&r1=701704&r2=701705&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java
Sat Oct 4 13:02:43 2008
@@ -23,9 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Properties;
public class MavenIT0075Test
extends AbstractMavenIntegrationTestCase
@@ -39,17 +37,16 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0075" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "-Dactivate=anything" );
- verifier.setCliOptions( cliOptions );
- List goals = Arrays.asList( new String[]{"help:active-profiles",
"package", "eclipse:eclipse", "clean:clean"} );
- verifier.executeGoals( goals );
- verifier.assertFileNotPresent(
"sub1/target/maven-it-it0075-sub1-1.0.jar" );
- verifier.assertFileNotPresent(
"sub2/target/maven-it-it0075-sub2-1.0.jar" );
+ Properties systemProperties = new Properties();
+ systemProperties.put( "activate", "anything" );
+ verifier.setSystemProperties( systemProperties );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-expression::eval" );
+ verifier.assertFilePresent( "sub1/target/expression.properties" );
+ verifier.assertFilePresent( "sub2/target/expression.properties" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/pom.xml?rev=701705&r1=701704&r2=701705&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/pom.xml
Sat Oct 4 13:02:43 2008
@@ -1,13 +1,38 @@
+<?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>
- <name>Maven Integration Test :: it0075</name>
+
<groupId>org.apache.maven.its.it0075</groupId>
<artifactId>maven-it-it0075</artifactId>
- <description>Verify that direct invocation of a mojo from the command line
still
- results in the processing of modules included via
profiles.</description>
<version>1.0</version>
<packaging>pom</packaging>
+ <name>Maven Integration Test :: it0075</name>
+ <description>
+ Verify that direct invocation of a mojo from the command line still
+ results in the processing of modules included via profiles.
+ </description>
+
<modules>
<module>sub1</module>
</modules>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub1/pom.xml?rev=701705&r1=701704&r2=701705&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub1/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub1/pom.xml
Sat Oct 4 13:02:43 2008
@@ -1,9 +1,32 @@
+<?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>
+
<parent>
<groupId>org.apache.maven.its.it0075</groupId>
<artifactId>maven-it-it0075</artifactId>
<version>1.0</version>
</parent>
+
<artifactId>sub1</artifactId>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub2/pom.xml?rev=701705&r1=701704&r2=701705&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub2/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0075/sub2/pom.xml
Sat Oct 4 13:02:43 2008
@@ -1,9 +1,32 @@
+<?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>
+
<parent>
<groupId>org.apache.maven.its.it0075</groupId>
<artifactId>maven-it-it0075</artifactId>
<version>1.0</version>
</parent>
+
<artifactId>sub2</artifactId>
</project>
