This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch maven305 in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
commit e538f37c53b89ecd0862324983672814c0454ea1 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Thu Jun 11 18:40:23 2020 +0200 Quickfix to Java 7 --- .../maven/reporting/exec/DefaultMavenPluginManagerHelper.java | 2 +- .../apache/maven/reporting/exec/DefaultMavenReportExecutor.java | 4 ++-- .../apache/maven/reporting/exec/MavenReportExecutorRequest.java | 2 +- src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java | 2 +- src/main/java/org/apache/maven/reporting/exec/ReportSet.java | 2 +- .../maven/reporting/exec/TestDefaultMavenReportExecutor.java | 9 +++------ 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java index 1de8dc7..858b014 100644 --- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java +++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java @@ -110,7 +110,7 @@ public class DefaultMavenPluginManagerHelper } } - return isEclipseAether.booleanValue(); + return isEclipseAether; } private Object createExclusionsDependencyFilter( List<String> artifactIdsList ) diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java index a878647..112e334 100644 --- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java +++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java @@ -248,7 +248,7 @@ public class DefaultMavenReportExecutor for ( ReportSet reportSet : reportPlugin.getReportSets() ) { - goals = new HashSet<String>(); + goals = new HashSet<>(); for ( String report : reportSet.getReports() ) { if ( goals.add( report ) ) @@ -387,7 +387,7 @@ public class DefaultMavenReportExecutor } catch ( PluginContainerException e ) { - /** + /* * ignore old plugin which are using removed PluginRegistry [INFO] Caused by: * java.lang.NoClassDefFoundError: org/apache/maven/plugin/registry/PluginRegistry */ diff --git a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutorRequest.java b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutorRequest.java index 931d5a1..6b595ce 100644 --- a/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutorRequest.java +++ b/src/main/java/org/apache/maven/reporting/exec/MavenReportExecutorRequest.java @@ -107,7 +107,7 @@ public class MavenReportExecutorRequest p.setConfiguration( new XmlPlexusConfiguration( (Xpp3Dom) r.getConfiguration() ) ); } - List<ReportSet> prs = new ArrayList<ReportSet>(); + List<ReportSet> prs = new ArrayList<>(); for ( org.apache.maven.model.ReportSet rs : r.getReportSets() ) { ReportSet ps = new ReportSet(); diff --git a/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java b/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java index d11dfc6..b2eba53 100644 --- a/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java +++ b/src/main/java/org/apache/maven/reporting/exec/ReportPlugin.java @@ -89,7 +89,7 @@ class ReportPlugin { if ( this.reportSets == null ) { - this.reportSets = new ArrayList<ReportSet>(); + this.reportSets = new ArrayList<>(); } return this.reportSets; diff --git a/src/main/java/org/apache/maven/reporting/exec/ReportSet.java b/src/main/java/org/apache/maven/reporting/exec/ReportSet.java index 9bea21a..9414a92 100644 --- a/src/main/java/org/apache/maven/reporting/exec/ReportSet.java +++ b/src/main/java/org/apache/maven/reporting/exec/ReportSet.java @@ -61,7 +61,7 @@ class ReportSet { if ( this.reports == null ) { - this.reports = new ArrayList<String>(); + this.reports = new ArrayList<>(); } return this.reports; diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java index 53332dc..9e21266 100644 --- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java @@ -234,7 +234,7 @@ public class TestDefaultMavenReportExecutor RepositorySystemSession repositorySystemSession = buildRepositorySystemSession( request ); - MavenSession mavenSession = new MavenSession( getContainer(), repositorySystemSession, request, result ) + return new MavenSession( getContainer(), repositorySystemSession, request, result ) { @Override public MavenProject getTopLevelProject() @@ -261,7 +261,6 @@ public class TestDefaultMavenReportExecutor } }; - return mavenSession; } private ArtifactRepository getLocalArtifactRepository() @@ -290,10 +289,8 @@ public class TestDefaultMavenReportExecutor settingsBuildingRequest.getSystemProperties().putAll( System.getProperties() ); - Settings settings = - getContainer().lookup( SettingsBuilder.class ).build( settingsBuildingRequest ).getEffectiveSettings(); - - return settings; + return getContainer().lookup( SettingsBuilder.class ) + .build( settingsBuildingRequest ).getEffectiveSettings(); }
