diff --git a/Jenkinsfile b/Jenkinsfile index 81caf8c1..5a994fd4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild(jdk:['8','11','12'], maven:['3.0.x', '3.2.x', '3.3.x', '3.5.x']) +asfMavenTlpPlgnBuild(jdk:['7','8','11','12'], maven:['3.0.x', '3.2.x', '3.3.x', '3.5.x']) diff --git a/pom.xml b/pom.xml index 12abee83..f0212131 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ under the License. 3.0 - 8 + 7 1.9 1.9.1 diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java index c3d10ab5..a9b88489 100644 --- a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java @@ -164,10 +164,14 @@ private static MavenProject getExecutionRootProject( List reactorP return null; } - return reactorProjects // - .stream() // - .filter( mavenProject -> mavenProject.isExecutionRoot() ) // - .findFirst().get(); - + // todo Lambda Java 1.8 + for ( MavenProject reactorProject : reactorProjects ) + { + if ( reactorProject.isExecutionRoot() ) + { + return reactorProject; + } + } + return null; } } diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java index 0d897004..7336d0f4 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java @@ -61,7 +61,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.stream.Collectors; import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; @@ -231,8 +230,7 @@ protected void checkInputEncoding() protected List getReports() throws MojoExecutionException { - List allReports; - + final List allReports; if ( isMaven3OrMore() ) { // Maven 3 @@ -257,18 +255,24 @@ protected List getReports() else { // Maven 2 - // [olamy] do we still need Maven2 support?? - allReports = reports.stream() - .map( report -> new MavenReportExecution( report ) ) - .collect( Collectors.toList() ); + allReports = new ArrayList<>( reports.size() ); + for ( MavenReport report : reports ) + { + allReports.add( new MavenReportExecution( report ) ); + } } // filter out reports that can't be generated - - return allReports.stream() // - .filter( mavenReportExecution -> mavenReportExecution.canGenerateReport() ) // - .collect( Collectors.toList() ); - + // todo Lambda Java 1.8 + List reportExecutions = new ArrayList<>( allReports.size() ); + for ( MavenReportExecution exec : allReports ) + { + if ( exec.canGenerateReport() ) + { + reportExecutions.add( exec ); + } + } + return reportExecutions; } /**