Skip to content

[MSITE-844] Java compiler 1.7 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[MSITE-844] Java compiler 1.7 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ 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>
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/org/apache/maven/plugins/site/deploy/SiteStageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,14 @@ private static MavenProject getExecutionRootProject( List<MavenProject> 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;
}
}
28 changes: 16 additions & 12 deletions src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -231,8 +230,7 @@ protected void checkInputEncoding()
protected List<MavenReportExecution> getReports()
throws MojoExecutionException
{
List<MavenReportExecution> allReports;

final List<MavenReportExecution> allReports;
if ( isMaven3OrMore() )
{
// Maven 3
Expand All @@ -257,18 +255,24 @@ protected List<MavenReportExecution> 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<MavenReportExecution> reportExecutions = new ArrayList<>( allReports.size() );
for ( MavenReportExecution exec : allReports )
{
if ( exec.canGenerateReport() )
{
reportExecutions.add( exec );
}
}
return reportExecutions;
}

/**
Expand Down