maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r541520 - in /maven/surefire/branches/surefire-2.3.x: maven-surefire-plugin/pom.xml pom.xml surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
Date Fri, 25 May 2007 03:25:04 GMT
Author: brett
Date: Thu May 24 20:25:03 2007
New Revision: 541520

URL: http://svn.apache.org/viewvc?view=rev&rev=541520
Log:
[SUREFIRE-322] correct URLs on Windows when using system classloader

Modified:
    maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/pom.xml
    maven/surefire/branches/surefire-2.3.x/pom.xml
    maven/surefire/branches/surefire-2.3.x/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java

Modified: maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/pom.xml?view=diff&rev=541520&r1=541519&r2=541520
==============================================================================
--- maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/pom.xml Thu May 24 20:25:03
2007
@@ -18,7 +18,9 @@
   ~ under the License.
   
 -->
-<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
+<project 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'
+         xmlns='http://maven.apache.org/POM/4.0.0'>
   <parent>
     <artifactId>surefire</artifactId>
     <groupId>org.apache.maven.surefire</groupId>
@@ -33,7 +35,7 @@
     <maven>2.0</maven>
   </prerequisites>
   <mailingLists>
-        <!-- duplication from maven-plugins pom - temporary until they inherit properly

+    <!-- duplication from maven-plugins pom - temporary until they inherit properly
     -->
     <mailingList>
       <name>Maven User List</name>
@@ -60,7 +62,7 @@
       <post>commits@maven.apache.org</post>
       <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
     </mailingList>
-        <!-- duplication from maven-parent pom - temporary until they inherit properly

+    <!-- duplication from maven-parent pom - temporary until they inherit properly
     -->
     <mailingList>
       <name>Maven Announcements List</name>
@@ -99,7 +101,6 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-booter</artifactId>
-      <version>2.3</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -114,7 +115,7 @@
   </dependencies>
 
   <profiles>
-        <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 
+    <!-- Force JDK 1.4 for this one, plugins can never be built on 1.3
     -->
     <profile>
       <id>jdk1.3</id>

Modified: maven/surefire/branches/surefire-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/branches/surefire-2.3.x/pom.xml?view=diff&rev=541520&r1=541519&r2=541520
==============================================================================
--- maven/surefire/branches/surefire-2.3.x/pom.xml (original)
+++ maven/surefire/branches/surefire-2.3.x/pom.xml Thu May 24 20:25:03 2007
@@ -17,7 +17,8 @@
   ~ 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">
+<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>maven-parent</artifactId>
@@ -111,6 +112,15 @@
     <module>maven-surefire-plugin</module>
     <module>maven-surefire-report-plugin</module>
   </modules>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>surefire-booter</artifactId>
+        <version>2.3.1-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <profiles>
     <!-- use preinstalled JDK 1.3 to build and test -->

Modified: maven/surefire/branches/surefire-2.3.x/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/branches/surefire-2.3.x/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java?view=diff&rev=541520&r1=541519&r2=541520
==============================================================================
--- maven/surefire/branches/surefire-2.3.x/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
(original)
+++ maven/surefire/branches/surefire-2.3.x/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkConfiguration.java
Thu May 24 20:25:03 2007
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.surefire.util.UrlUtils;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.jar.Manifest;
@@ -228,8 +229,7 @@
         for ( Iterator it = classPath.iterator(); it.hasNext(); )
         {
             String el = (String) it.next();
-            el = "file://localhost/" + el;
-            cp += " " + el + ( new File( el ).isDirectory() ? "/" : "" );
+            cp += UrlUtils.getURL( new File( el ) ).toExternalForm() + " ";
         }
 
         Manifest.Attribute attr = new Manifest.Attribute( "Class-Path", cp.trim() );



Mime
View raw message