Repository: maven-surefire Updated Branches: refs/heads/master 78dca27ef -> 23111dceb
[SUREFIRE] booter compatibility with jdk5 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/23111dce Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/23111dce Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/23111dce Branch: refs/heads/master Commit: 23111dcebd3bb4acc3614d97f02d3943984b771c Parents: 78dca27 Author: Tibor17 <tibo...@lycos.com> Authored: Fri Jul 24 01:05:01 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Fri Jul 24 01:05:01 2015 +0200 ---------------------------------------------------------------------- .../surefire/booterclient/ProviderDetector.java | 4 +- .../src/site/apt/developing.apt.vm | 4 +- .../report/LegacyPojoStackTraceWriter.java | 2 +- .../pom.xml | 11 +++ .../surefire-141-pluggableproviders/pom.xml | 83 +++++++++++--------- 5 files changed, 62 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23111dce/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java index cc71fe9..2d31288 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java +++ b/maven-surefire-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 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23111dce/maven-surefire-plugin/src/site/apt/developing.apt.vm ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/site/apt/developing.apt.vm b/maven-surefire-plugin/src/site/apt/developing.apt.vm index ef8103f..fcb1930 100644 --- 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 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23111dce/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java ---------------------------------------------------------------------- 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 index 685ea7b..d19c618 100644 --- 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 java.io.StringWriter; 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:br...@apache.org";>Brett Porter</a> * @noinspection ThrowableResultOfMethodCallIgnored http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23111dce/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml index 418ec0f..dded577 100644 --- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml +++ b/surefire-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> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23111dce/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml ---------------------------------------------------------------------- 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 index 774bb50..5614e35 100644 --- 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>
