You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by jd...@apache.org on 2007/10/27 03:45:57 UTC
svn commit: r589023 - in /maven/surefire/trunk:
maven-surefire-plugin/pom.xml pom.xml surefire-booter/pom.xml
surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
Author: jdcasey
Date: Fri Oct 26 18:45:56 2007
New Revision: 589023
URL: http://svn.apache.org/viewvc?rev=589023&view=rev
Log:
Fixing problem with wrong version of plexus-archiver being brought in...it's hackish, but works.
Modified:
maven/surefire/trunk/maven-surefire-plugin/pom.xml
maven/surefire/trunk/pom.xml
maven/surefire/trunk/surefire-booter/pom.xml
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=589023&r1=589022&r2=589023&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Fri Oct 26 18:45:56 2007
@@ -90,6 +90,11 @@
</contributors>
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-10-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=589023&r1=589022&r2=589023&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Fri Oct 26 18:45:56 2007
@@ -79,6 +79,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-10-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
<version>2.4-SNAPSHOT</version>
@@ -93,11 +98,6 @@
<artifactId>plexus-utils</artifactId>
<version>1.4.5</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-10-SNAPSHOT</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=589023&r1=589022&r2=589023&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Fri Oct 26 18:45:56 2007
@@ -9,16 +9,16 @@
<name>SureFire Booter</name>
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
</dependency>
</dependencies>
</project>
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java?rev=589023&r1=589022&r2=589023&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java Fri Oct 26 18:45:56 2007
@@ -229,6 +229,7 @@
throws IOException, ManifestException, ArchiverException
{
JarArchiver jar = new JarArchiver();
+
jar.setCompress( false ); // for speed
File file = File.createTempFile( "surefirebooter", ".jar" );
file.deleteOnExit();