Author: bentmann
Date: Sun May 17 16:40:29 2009
New Revision: 775704
URL: http://svn.apache.org/viewvc?rev=775704&view=rev
Log:
o Decoupled IT from production plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java?rev=775704&r1=775703&r2=775704&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
Sun May 17 16:40:29 2009
@@ -60,6 +60,10 @@
File remoteRepo = new File( testDir, "target/deployment" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteDirectory( "level2/target" );
+ verifier.deleteDirectory( "level2/level3/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3057" );
Properties properties = verifier.newDefaultFilterProperties();
@@ -78,7 +82,7 @@
// envars.put( "MAVEN_OPTS", "-Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=5005 -Djava.compiler=NONE" );
// verifier.executeGoal( "deploy", envars );
- verifier.executeGoal( "deploy" );
+ verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -107,4 +111,5 @@
assertNull( parent );
}
}
+
}
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar?rev=775704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml?rev=775704&r1=775703&r2=775704&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
Sun May 17 16:40:29 2009
@@ -1,21 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>level2</artifactId>
<groupId>org.apache.maven.its.mng3057</groupId>
+ <artifactId>level2</artifactId>
<version>${testVersion}</version>
</parent>
+
<artifactId>level3</artifactId>
<version>${testVersion}</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set</goal>
+ <goal>attach-pom</goal>
+ </goals>
+ <configuration>
+ <mainFile>artifact.jar</mainFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml?rev=775704&r1=775703&r2=775704&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
Sun May 17 16:40:29 2009
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>mng-3057</artifactId>
- <groupId>org.apache.maven.its.mng3057</groupId>
- <version>${testVersion}</version>
- </parent>
+ <groupId>org.apache.maven.its.mng3057</groupId>
+ <artifactId>mng-3057</artifactId>
+ <version>${testVersion}</version>
+ </parent>
+
<artifactId>level2</artifactId>
<version>${testVersion}</version>
<packaging>pom</packaging>
+
<modules>
<module>level3</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml?rev=775704&r1=775703&r2=775704&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3057/pom.xml
Sun May 17 16:40:29 2009
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.mng3057</groupId>
<artifactId>mng-3057</artifactId>
<version>${testVersion}</version>
-
<packaging>pom</packaging>
<name>Integration Test Project for MNG-3057</name>
<description>
- This project verifies that MNG-3057 is fixed. It is controlled by a JUnit
test called org.apache.maven.integrationtests.MNG3057Test
+ This project verifies that MNG-3057 is fixed.
</description>
<distributionManagement>
@@ -24,26 +24,46 @@
<modules>
<module>level2</module>
</modules>
-
- <!-- This section is technically INCORRECT, but should have no effect on the
result
- of the build. It is described in MCOMPILER-94, and could interact with
the
- handling of POMs for install and deploy, when packaging == pom. Adding
here
- to force the issue and make sure the POM transformation still happens
correctly.
- -->
+
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
<executions>
<execution>
+ <!--
+ This execution is technically INCORRECT, but should have no
effect on the result
+ of the build. It is described in MCOMPILER-94, and could
interact with the
+ handling of POMs for install and deploy, when packaging == pom.
Adding here
+ to force the issue and make sure the POM transformation still
happens correctly.
+ -->
<id>mcompiler-94</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>set</goal>
+ </goals>
+ <configuration>
+ <mainFile>target/classes</mainFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>deploy</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>compile</goal>
+ <goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
