You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/09/09 08:44:06 UTC
maven-surefire git commit: [SUREFIRE-1262] Make code compilable with
Java 1.6
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1262 ea92f9e40 -> a3c07e776
[SUREFIRE-1262] Make code compilable with Java 1.6
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/a3c07e77
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/a3c07e77
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/a3c07e77
Branch: refs/heads/SUREFIRE-1262
Commit: a3c07e776d9a663a1618b875123e32442935b0e6
Parents: ea92f9e
Author: rfscholte <rf...@apache.org>
Authored: Sat Sep 9 10:44:01 2017 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Sat Sep 9 10:44:01 2017 +0200
----------------------------------------------------------------------
.../apache/maven/plugin/surefire/AbstractSurefireMojo.java | 2 +-
pom.xml | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a3c07e77/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 8509d18..676527f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1685,7 +1685,7 @@ public abstract class AbstractSurefireMojo
Classpath testClasspath = new Classpath( result.getClasspathElements() );
Classpath testModulepath = new Classpath( result.getModulepathElements().keySet() );
- Set<String> packages = new TreeSet<>();
+ Set<String> packages = new TreeSet<String>();
for ( Object file : scanResult.getFiles() )
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/a3c07e77/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7c1dba8..3073863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
+ <javaVersion>6</javaVersion>
<mavenVersion>2.2.1</mavenVersion>
<!-- <shadedVersion>2.12.4</shadedVersion> commented out due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<mavenPluginPluginVersion>3.5</mavenPluginPluginVersion>
@@ -364,8 +364,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
+ <artifactId>java16</artifactId>
+ <version>1.1</version>
</signature>
</configuration>
</plugin>
@@ -454,6 +454,9 @@
<ignoreClasses>
<ignoreClass>module-info</ignoreClass>
</ignoreClasses>
+ <excludes>
+ <exclude>org.codehaus.plexus:plexus-java</exclude>
+ </excludes>
</enforceBytecodeVersion>
</rules>
</configuration>