Fixing build

cardil · cardil · commit 8436faa62f23 · 2018-05-25T21:13:15.000+02:00
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
@@ -37,18 +37,18 @@ abstract class AbstractClasspathForkConfiguration
 {
 
     @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
@@ -162,7 +162,7 @@ private final class CloseableCloser
 
         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
@@ -502,7 +502,7 @@ private static final class EncodingOutputStream
 
         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
@@ -42,7 +42,7 @@ class Utf8RecodingDeferredFileOutputStream
     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
@@ -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
@@ -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
@@ -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
@@ -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 @@ class ClassLoaderProxy
         /**
          * @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
@@ -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 @@ private static class IgnoredWithUserError
     {
         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
@@ -32,7 +32,7 @@ final class FilteringRequest
 {
     private Runner filteredRunner;
 
-    public FilteringRequest( Request req, Filter filter )
+    FilteringRequest( Request req, Filter filter )
     {
         try
         {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private final class CloseableCloser`
`162`	`162`
`163`	`163`	`private final Thread inputStreamCloserHook;`
`164`	`164`
`165`		`- public CloseableCloser( int jvmRun, Closeable... testProvidingInputStream )`
	`165`	`+ CloseableCloser( int jvmRun, Closeable... testProvidingInputStream )`
`166`	`166`	`{`
`167`	`167`	`this.jvmRun = jvmRun;`
`168`	`168`	`this.testProvidingInputStream = new ConcurrentLinkedQueue<Closeable>();`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ private static final class EncodingOutputStream`
`502`	`502`
`503`	`503`	`private int c2;`
`504`	`504`
`505`		`- public EncodingOutputStream( OutputStream out )`
	`505`	`+ EncodingOutputStream( OutputStream out )`
`506`	`506`	`{`
`507`	`507`	`super( out );`
`508`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class Utf8RecodingDeferredFileOutputStream`
`42`	`42`	`private boolean closed = false;`
`43`	`43`
`44`	`44`	`@SuppressWarnings( "checkstyle:magicnumber" )`
`45`		`- public Utf8RecodingDeferredFileOutputStream( String channel )`
	`45`	`+ Utf8RecodingDeferredFileOutputStream( String channel )`
`46`	`46`	`{`
`47`	`47`	`this.deferredFileOutputStream = new DeferredFileOutputStream( 1000000, channel, "deferred", null );`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class FilteringRequest`
`32`	`32`	`{`
`33`	`33`	`private Runner filteredRunner;`
`34`	`34`
`35`		`- public FilteringRequest( Request req, Filter filter )`
	`35`	`+ FilteringRequest( Request req, Filter filter )`
`36`	`36`	`{`
`37`	`37`	`try`
`38`	`38`	`{`