commit 435b018720c83688f6223d7b490cec4442439600
author tibordigana <tibordigana@apache.org> Fri Jul 05 12:47:53 2019 +0200
committer Michael Osipov <michaelo@apache.org> Sun Jul 07 19:53:23 2019 +0200
tree 0ff6307aafbecfbf84d69fbc0deb46dde64adb5a
parent 30428f042c5f3788668a7340410955795d58979f

[MSITE-844] Downgrade to Java 7

This closes #10

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 81caf8c..5a994fd 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'])

pom.xml

diff --git a/pom.xml b/pom.xml
index 4e749b9..13db5f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,7 +196,7 @@
 
   <properties>
     <mavenVersion>3.0</mavenVersion>
-    <javaVersion>8</javaVersion>
+    <javaVersion>7</javaVersion>
     <!-- for dependencies -->
     <doxiaVersion>1.9</doxiaVersion>
     <doxiaSitetoolsVersion>1.9.1</doxiaSitetoolsVersion>

src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java

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 c3d10ab..a9b8848 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 @@
             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;
     }
 }

src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java

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 0d89700..7336d0f 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 List<MavenReportExecution> getReports()
         throws MojoExecutionException
     {
-        List<MavenReportExecution> allReports;
-
+        final List<MavenReportExecution> allReports;
         if ( isMaven3OrMore() )
         {
             // Maven 3
@@ -257,18 +255,24 @@
         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<MavenReportExecution> reportExecutions = new ArrayList<>( allReports.size() );
+        for ( MavenReportExecution exec : allReports )
+        {
+            if ( exec.canGenerateReport() )
+            {
+                reportExecutions.add( exec );
+            }
+        }
+        return reportExecutions;
     }
 
     /**