olamy closed pull request #186: Fixing build on master branch
URL: https://github.com/apache/maven-surefire/pull/186
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/AbstractClasspathForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/AbstractClasspathForkConfiguration.java
index 5834dfbc7..6c57ebc31 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/AbstractClasspathForkConfiguration.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/AbstractClasspathForkConfiguration.java
@@ -37,18 +37,18 @@
{
@SuppressWarnings( "checkstyle:parameternumber" )
- public AbstractClasspathForkConfiguration( @Nonnull Classpath
bootClasspath,
- @Nonnull File tempDirectory,
- @Nullable String debugLine,
- @Nonnull File workingDirectory,
- @Nonnull Properties
modelProperties,
- @Nullable String argLine,
- @Nonnull Map<String, String>
environmentVariables,
- boolean debug,
- int forkCount,
- boolean reuseForks,
- @Nonnull Platform
pluginPlatform,
- @Nonnull ConsoleLogger log )
+ AbstractClasspathForkConfiguration( @Nonnull Classpath bootClasspath,
+ @Nonnull File tempDirectory,
+ @Nullable String debugLine,
+ @Nonnull File workingDirectory,
+ @Nonnull Properties modelProperties,
+ @Nullable String argLine,
+ @Nonnull Map<String, String>
environmentVariables,
+ boolean debug,
+ int forkCount,
+ boolean reuseForks,
+ @Nonnull Platform pluginPlatform,
+ @Nonnull ConsoleLogger log )
{
super( bootClasspath, tempDirectory, debugLine, workingDirectory,
modelProperties, argLine,
environmentVariables, debug, forkCount, reuseForks,
pluginPlatform, log );
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 8339349ce..44b5bff5c 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -162,7 +162,7 @@
private final Thread inputStreamCloserHook;
- public CloseableCloser( int jvmRun, Closeable...
testProvidingInputStream )
+ CloseableCloser( int jvmRun, Closeable... testProvidingInputStream )
{
this.jvmRun = jvmRun;
this.testProvidingInputStream = new
ConcurrentLinkedQueue<Closeable>();
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 533e1cad2..eab3b3b4a 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -502,7 +502,7 @@ private static String extraEscape( String message, boolean
attribute )
private int c2;
- public EncodingOutputStream( OutputStream out )
+ EncodingOutputStream( OutputStream out )
{
super( out );
}
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
index 0aa00c7bb..50c5b9c59 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/Utf8RecodingDeferredFileOutputStream.java
@@ -42,7 +42,7 @@
private boolean closed = false;
@SuppressWarnings( "checkstyle:magicnumber" )
- public Utf8RecodingDeferredFileOutputStream( String channel )
+ Utf8RecodingDeferredFileOutputStream( String channel )
{
this.deferredFileOutputStream = new DeferredFileOutputStream( 1000000,
channel, "deferred", null );
}
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
index f534aa290..ea9786a4f 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
@@ -19,13 +19,14 @@
* under the License.
*/
-import java.io.File;
-import java.util.Locale;
-import java.util.ResourceBundle;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import java.io.File;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
import static org.apache.maven.shared.utils.StringUtils.isEmpty;
/**
@@ -95,7 +96,8 @@ public String getOutputName()
protected LocalizedProperties getBundle( Locale locale, ClassLoader
resourceBundleClassLoader )
{
ResourceBundle bundle = ResourceBundle.getBundle( "surefire-report",
locale, resourceBundleClassLoader );
- return new LocalizedProperties( bundle ) {
+ return new LocalizedProperties( bundle )
+ {
@Override
public String getReportName()
{
diff --git
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
index 3c93737a0..1a852dbfb 100644
---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
+++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
@@ -19,16 +19,16 @@
* under the License.
*/
-import java.io.File;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import java.io.File;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
import static org.apache.maven.shared.utils.StringUtils.isEmpty;
/**
@@ -95,7 +95,8 @@ public String getOutputName()
protected LocalizedProperties getBundle( Locale locale, ClassLoader
resourceBundleClassLoader )
{
ResourceBundle bundle = ResourceBundle.getBundle( "surefire-report",
locale, resourceBundleClassLoader );
- return new LocalizedProperties( bundle ) {
+ return new LocalizedProperties( bundle )
+ {
@Override
public String getReportName()
{
diff --git a/pom.xml b/pom.xml
index 32b8e9db1..bd1f2e352 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>30</version>
+ <version>31</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
index 097a3fa7a..bab76daea 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
@@ -19,15 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.log.api.ConsoleLoggerDecorator;
import org.apache.maven.surefire.cli.CommandLineOption;
@@ -44,16 +35,23 @@
import org.apache.maven.surefire.util.SurefireReflectionException;
import javax.annotation.Nonnull;
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
import static java.util.Collections.checkedList;
-
import static org.apache.maven.surefire.util.ReflectionUtils.getConstructor;
import static org.apache.maven.surefire.util.ReflectionUtils.getMethod;
+import static org.apache.maven.surefire.util.ReflectionUtils.instantiateOneArg;
+import static
org.apache.maven.surefire.util.ReflectionUtils.instantiateTwoArgs;
import static org.apache.maven.surefire.util.ReflectionUtils.invokeGetter;
import static
org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray;
-import static org.apache.maven.surefire.util.ReflectionUtils.instantiateOneArg;
import static org.apache.maven.surefire.util.ReflectionUtils.invokeSetter;
-import static
org.apache.maven.surefire.util.ReflectionUtils.instantiateTwoArgs;
import static org.apache.maven.surefire.util.ReflectionUtils.newInstance;
/**
@@ -160,7 +158,7 @@ public Object convertIfRunResult( Object result )
/**
* @param delegate a target
*/
- public ClassLoaderProxy( Object delegate )
+ ClassLoaderProxy( Object delegate )
{
this.target = delegate;
}
diff --git
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
index 2d651c42b..33596f7ff 100644
---
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
+++
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
@@ -19,17 +19,17 @@
* under the License.
*/
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
import org.apache.maven.surefire.util.SurefireReflectionException;
import org.junit.Ignore;
import org.junit.runner.Description;
import org.junit.runner.Request;
-import static org.apache.maven.surefire.util.ReflectionUtils.tryGetMethod;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import static
org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray;
+import static org.apache.maven.surefire.util.ReflectionUtils.tryGetMethod;
/**
* JUnit4 reflection helper
@@ -114,12 +114,12 @@ public static Ignore createIgnored( String value )
{
private final String value;
- public IgnoredWithUserError( String value )
+ IgnoredWithUserError( String value )
{
this.value = value;
}
- public IgnoredWithUserError()
+ IgnoredWithUserError()
{
this( "" );
}
diff --git
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/FilteringRequest.java
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/FilteringRequest.java
index 5e1c19240..2adabbb83 100644
---
a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/FilteringRequest.java
+++
b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/FilteringRequest.java
@@ -32,7 +32,7 @@
{
private Runner filteredRunner;
- public FilteringRequest( Request req, Filter filter )
+ FilteringRequest( Request req, Filter filter )
{
try
{
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
