[SUREFIRE] booter compatibility with jdk5

apache · Jul 23, 2015 · 23111dc · 23111dc
1 parent 78dca27
commit 23111dc
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 42 deletions.
diff --git a/...-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java b/...-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
@@ -90,14 +90,14 @@ public class ProviderDetector
                     {
                         continue nextUrl; // next url
                     }
-                    char cp = line.charAt( 0 ); // should use codePointAt but this is JDK1.3
+                    char cp = line.charAt( 0 ); // should use codePointAt but this was JDK1.3
                     if ( !Character.isJavaIdentifierStart( cp ) )
                     {
                         continue nextUrl; // next url
                     }
                     for ( int i = 1; i < n; i++ )
                     {
-                        cp = line.charAt( i );  // should use codePointAt but this is JDK1.3
+                        cp = line.charAt( i );  // should use codePointAt but this was JDK1.3
                         if ( !Character.isJavaIdentifierPart( cp ) && ( cp != '.' ) )
                         {
                             continue nextUrl; // next url

diff --git a/maven-surefire-plugin/src/site/apt/developing.apt.vm b/maven-surefire-plugin/src/site/apt/developing.apt.vm
@@ -114,9 +114,9 @@ ForkedBooter#main
 
 * JDK Versions
 
-  The surefire booter is capable of booting all the way back to jdk1.3. Specifically
+  The surefire booter is capable of booting all the way back to jdk1.5. Specifically
   this means <<<surefire-api>>>, <<<surefire-booter>>>, <<<common-junit3>>> and <<<surefire-junit3>>> are
-  source/target 1.3. The plugin and several providers are 1.5.
+  source/target 1.5. The plugin and several providers are 1.5.
 
 * Provider Isolation
 

diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
@@ -25,7 +25,7 @@
 import org.apache.maven.surefire.util.internal.StringUtils;
 
 /**
- * Write the trace out for a POJO test. Java 1.3 compatible.
+ * Write the trace out for a POJO test. Java 1.5 compatible.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @noinspection ThrowableResultOfMethodCallIgnored

diff --git a/...ire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/...ire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
@@ -44,6 +44,17 @@
         <targetPath>META-INF</targetPath>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
 

diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
@@ -21,45 +21,54 @@
 <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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.apache.maven.plugins.surefire</groupId>
-    <artifactId>surefire141-test</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>surefire-141-pluggableproviders</name>
+  <groupId>org.apache.maven.plugins.surefire</groupId>
+  <artifactId>surefire141-test</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>surefire-141-pluggableproviders</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <properties>
-      <surefire.version>2.12.4</surefire.version>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit3</artifactId>
-                        <version>${surefire.version}</version>
-                    </dependency>
-                  <dependency>
-                      <groupId>org.apache.maven.plugins.surefire</groupId>
-                      <artifactId>surefire-test-provider</artifactId>
-                      <version>1.0-SNAPSHOT</version>
-                  </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+  <properties>
+    <surefire.version>2.12.4</surefire.version>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit3</artifactId>
+            <version>${surefire.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.plugins.surefire</groupId>
+            <artifactId>surefire-test-provider</artifactId>
+            <version>1.0-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>