Author: bentmann
Date: Thu Sep 25 14:31:43 2008
New Revision: 699099
URL: http://svn.apache.org/viewvc?rev=699099&view=rev
Log:
o Decoupled it0074 from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0074/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0074/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java?rev=699099&r1=699098&r2=699099&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0074Test.java
Thu Sep 25 14:31:43 2008
@@ -37,11 +37,11 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0074" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "eclipse:eclipse" );
- verifier.assertFilePresent( ".classpath" );
+ verifier.executeGoal( "process-resources" );
+ verifier.assertFilePresent( "target/exec-level.txt" );
+ verifier.assertFilePresent( "target/resources-resources.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0074/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0074/pom.xml?rev=699099&r1=699098&r2=699099&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0074/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0074/pom.xml
Thu Sep 25 14:31:43 2008
@@ -1,37 +1,53 @@
+<?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 :: it0074</name>
+
<groupId>org.apache.maven.its.it0074</groupId>
<artifactId>maven-it-it0074</artifactId>
- <description>Test that plugin-level configuration instances are not
nullified by
- execution-level configuration instances.</description>
<version>1.0</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
-
+ <name>Maven Integration Test :: it0074</name>
+ <description>
+ Test that plugin-level configuration instances are not nullified by
+ execution-level configuration instances.
+ </description>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>0.1-stub-SNAPSHOT</version>
<executions>
<execution>
<id>precompile</id>
<phase>initialize</phase>
<configuration>
- <includes >
- <include
implementation="java.lang.String">org/apache/maven/it0074/Person.java</include>
- </includes>
+ <pathname>target/exec-level.txt</pathname>
</configuration>
<goals>
- <goal>compile</goal>
+ <goal>resources</goal>
</goals>
</execution>
</executions>
