Author: carlos
Date: Sun Apr 30 13:19:18 2006
New Revision: 398427
URL: http://svn.apache.org/viewcvs?rev=398427&view=rev
Log:
Moved JDK 1.3 compatibility classes to separate project
Removed:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/util/
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooterForkException.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/shell/Shell.java
maven/surefire/trunk/surefire/pom.xml
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java?rev=398427&r1=398426&r2=398427&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
Sun Apr 30 13:19:18 2006
@@ -16,12 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.util.NestedCheckedException;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -37,6 +31,12 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
+import org.apache.maven.util.jdk13.NestedCheckedException;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.StreamConsumer;
/**
* @author Jason van Zyl
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooterForkException.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooterForkException.java?rev=398427&r1=398426&r2=398427&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooterForkException.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooterForkException.java
Sun Apr 30 13:19:18 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.util.NestedCheckedException;
+import org.apache.maven.util.jdk13.NestedCheckedException;
/**
* Encapsulates exceptions thrown during Surefire forking.
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/shell/Shell.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/shell/Shell.java?rev=398427&r1=398426&r2=398427&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/shell/Shell.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/shell/Shell.java
Sun Apr 30 13:19:18 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.util.NestedRuntimeException;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.Commandline;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
+import org.apache.maven.util.jdk13.NestedRuntimeException;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.Commandline;
/**
* <p>
Modified: maven/surefire/trunk/surefire/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/pom.xml?rev=398427&r1=398426&r2=398427&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/pom.xml (original)
+++ maven/surefire/trunk/surefire/pom.xml Sun Apr 30 13:19:18 2006
@@ -1,4 +1,23 @@
-<?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";>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed 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";>
<parent>
<artifactId>surefire-root</artifactId>
<groupId>org.apache.maven.surefire</groupId>
@@ -19,6 +38,11 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.util</groupId>
+ <artifactId>jdk13-util</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
