Author: bentmann
Date: Sat Aug 8 14:56:38 2009
New Revision: 802386
URL: http://svn.apache.org/viewvc?rev=802386&view=rev
Log:
o Stabilized ITs
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java?rev=802386&r1=802385&r2=802386&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
Sat Aug 8 14:56:38 2009
@@ -23,7 +23,6 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List goals = this.getInitialGoals();
- goals.add( "jxr:test-jxr" );
goals.add( "surefire-report:report" );
verifier.executeGoals( goals );
//DGF even though the build will succeed, the log will contain errors
(from the failure)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml?rev=802386&r1=802385&r2=802386&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
Sat Aug 8 14:56:38 2009
@@ -48,13 +48,8 @@
<reporting>
<plugins>
<plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml?rev=802386&r1=802385&r2=802386&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
Sat Aug 8 14:56:38 2009
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire.its</groupId>
- <artifactId>surefire-162-charsetProvider</artifactId>
- <name>Test alternate CharsetProvider</name>
- <version>1.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
-
<useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jcharset</groupId>
- <artifactId>jcharset</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire.its</groupId>
+ <artifactId>surefire-162-charsetProvider</artifactId>
+ <name>Test alternate CharsetProvider</name>
+ <version>1.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jcharset</groupId>
+ <artifactId>jcharset</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
