Merge pull request #9 from apache/upgrade-cleanup
cleanup pom, upgrade some code to modern sugar syntax
diff --git a/Jenkinsfile b/Jenkinsfile
index eb67523..bad2d5d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpStdBuild(jdk:['8','11','12','13'])
+asfMavenTlpStdBuild(jdk:['8','11','17'])
diff --git a/pom.xml b/pom.xml
index 4015b4e..e2d36d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>34</version>
+ <version>36</version>
<relativePath></relativePath>
</parent>
@@ -57,8 +57,9 @@
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
+ <slf4jVersion>1.7.36</slf4jVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -116,35 +117,12 @@
<artifactId>maven-shared-utils</artifactId>
<version>0.7</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4jVersion}</version>
+ </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-16</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>1.7.1</version>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelper.java b/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelper.java
index cebe33f..78d09af 100644
--- a/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelper.java
+++ b/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelper.java
@@ -26,6 +26,8 @@
import org.apache.maven.shared.utils.io.DirectoryScanResult;
import org.apache.maven.shared.utils.io.DirectoryScanner;
import org.apache.maven.shared.utils.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -36,6 +38,9 @@
*/
public class IncrementalBuildHelper
{
+
+ private static final Logger LOGGER = LoggerFactory.getLogger( IncrementalBuildHelper.class );
+
/**
* the root directory to store status information about Maven executions in.
*/
@@ -169,8 +174,7 @@
public boolean inputFileTreeChanged( IncrementalBuildHelperRequest incrementalBuildHelperRequest )
throws MojoExecutionException
{
- File mojoConfigBase = getMojoStatusDirectory();
- File mojoConfigFile = new File( mojoConfigBase, INPUT_FILES_LST_FILENAME );
+ File mojoConfigFile = new File( getMojoStatusDirectory(), INPUT_FILES_LST_FILENAME );
String[] oldInputFiles = new String[0];
@@ -185,13 +189,8 @@
throw new MojoExecutionException( "Error reading old mojo status " + mojoConfigFile, e );
}
}
-
- String[] inputFileNames = new String[incrementalBuildHelperRequest.getInputFiles().size()];
- int i = 0;
- for ( File inputFile : incrementalBuildHelperRequest.getInputFiles() )
- {
- inputFileNames[i++] = inputFile.getAbsolutePath();
- }
+ String[] inputFileNames = incrementalBuildHelperRequest.getInputFiles()
+ .stream().map( File::getAbsolutePath ).toArray( String[]::new );
DirectoryScanResult dsr = DirectoryScanner.diffFiles( oldInputFiles, inputFileNames );
@@ -221,8 +220,7 @@
public boolean inputFileTreeChanged( DirectoryScanner dirScanner )
throws MojoExecutionException
{
- File mojoConfigBase = getMojoStatusDirectory();
- File mojoConfigFile = new File( mojoConfigBase, INPUT_FILES_LST_FILENAME );
+ File mojoConfigFile = new File( getMojoStatusDirectory(), INPUT_FILES_LST_FILENAME );
String[] oldInputFiles = new String[0];
@@ -362,20 +360,7 @@
private String[] toArrayOfPath( Set<File> files )
{
- if ( files == null || files.isEmpty() )
- {
- return EMPTY_ARRAY;
- }
- String[] paths = new String[files.size()];
-
- int i = 0;
-
- for ( File file : files )
- {
- paths[i] = file.getPath();
- i++;
- }
-
- return paths;
+ return ( files == null || files.isEmpty() )
+ ? EMPTY_ARRAY : files.stream().map( File::getPath ).toArray( String[]::new );
}
}
diff --git a/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelperRequest.java b/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelperRequest.java
index 8423172..07ef1ab 100644
--- a/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelperRequest.java
+++ b/src/main/java/org/apache/maven/shared/incremental/IncrementalBuildHelperRequest.java
@@ -42,7 +42,7 @@
{
if ( inputFiles == null )
{
- this.inputFiles = new HashSet<File>();
+ this.inputFiles = new HashSet<>();
}
return inputFiles;
}
