You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/05 10:48:25 UTC
[maven-site-plugin] 01/01: Jetty 9.2.9
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jetty929
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 709ffe0ee31ffcaf87881db40bf6c5da2a7a4f50
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Jul 5 12:47:53 2019 +0200
Jetty 9.2.9
---
Jenkinsfile | 2 +-
pom.xml | 4 +-
.../maven/plugins/site/deploy/SiteStageMojo.java | 14 ++++--
.../site/render/AbstractSiteRenderingMojo.java | 56 +++++++++-------------
4 files changed, 35 insertions(+), 41 deletions(-)
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'])
diff --git a/pom.xml b/pom.xml
index 12abee8..2e9a2e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,11 +196,11 @@ under the License.
<properties>
<mavenVersion>3.0</mavenVersion>
- <javaVersion>8</javaVersion>
+ <javaVersion>7</javaVersion>
<!-- for dependencies -->
<doxiaVersion>1.9</doxiaVersion>
<doxiaSitetoolsVersion>1.9.1</doxiaSitetoolsVersion>
- <jettyVersion>9.4.12.v20180830</jettyVersion>
+ <jettyVersion>9.2.9.v20150224</jettyVersion>
<plexusVersion>1.5.4</plexusVersion>
<scmVersion>1.4</scmVersion>
<wagonVersion>3.3.1</wagonVersion>
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 @@ public class SiteStageMojo
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 0d89700..3ab64b8 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.LinkedHashMap;
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,44 +230,35 @@ public abstract class AbstractSiteRenderingMojo
protected List<MavenReportExecution> getReports()
throws MojoExecutionException
{
- List<MavenReportExecution> allReports;
-
- if ( isMaven3OrMore() )
+ MavenReportExecutorRequest mavenReportExecutorRequest = new MavenReportExecutorRequest();
+ mavenReportExecutorRequest.setLocalRepository( localRepository );
+ mavenReportExecutorRequest.setMavenSession( mavenSession );
+ mavenReportExecutorRequest.setProject( project );
+ mavenReportExecutorRequest.setReportPlugins( getReportingPlugins() );
+
+ MavenReportExecutor mavenReportExecutor;
+ try
{
- // Maven 3
- MavenReportExecutorRequest mavenReportExecutorRequest = new MavenReportExecutorRequest();
- mavenReportExecutorRequest.setLocalRepository( localRepository );
- mavenReportExecutorRequest.setMavenSession( mavenSession );
- mavenReportExecutorRequest.setProject( project );
- mavenReportExecutorRequest.setReportPlugins( getReportingPlugins() );
-
- MavenReportExecutor mavenReportExecutor;
- try
- {
- mavenReportExecutor = container.lookup( MavenReportExecutor.class );
- }
- catch ( ComponentLookupException e )
- {
- throw new MojoExecutionException( "could not get MavenReportExecutor component", e );
- }
-
- allReports = mavenReportExecutor.buildMavenReports( mavenReportExecutorRequest );
+ mavenReportExecutor = container.lookup( MavenReportExecutor.class );
}
- else
+ catch ( ComponentLookupException e )
{
- // Maven 2
- // [olamy] do we still need Maven2 support??
- allReports = reports.stream()
- .map( report -> new MavenReportExecution( report ) )
- .collect( Collectors.toList() );
+ throw new MojoExecutionException( "could not get MavenReportExecutor component", e );
}
- // filter out reports that can't be generated
-
- return allReports.stream() //
- .filter( mavenReportExecution -> mavenReportExecution.canGenerateReport() ) //
- .collect( Collectors.toList() );
+ List<MavenReportExecution> allReports = mavenReportExecutor.buildMavenReports( mavenReportExecutorRequest );
+ // filter out reports that can't be generated
+ // todo Lambda Java 1.8
+ List<MavenReportExecution> reportExecutions = new ArrayList<>( allReports.size() );
+ for ( MavenReportExecution exec : allReports )
+ {
+ if ( exec.canGenerateReport() )
+ {
+ reportExecutions.add( exec );
+ }
+ }
+ return reportExecutions;
}
/**