You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/11 16:40:58 UTC
[maven-reporting-exec] branch maven305 created (now ef15ee6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch maven305
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git.
at ef15ee6 Upgrade to Maven 3.0.5
This branch includes the following new commits:
new e538f37 Quickfix to Java 7
new ef15ee6 Upgrade to Maven 3.0.5
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-reporting-exec] 01/02: Quickfix to Java 7
Posted by sl...@apache.org.
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 <sl...@apache.org>
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();
}
[maven-reporting-exec] 02/02: Upgrade to Maven 3.0.5
Posted by sl...@apache.org.
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 ef15ee6d8c417b54ef2001de2302cf1d862b59cd
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Jun 11 18:40:39 2020 +0200
Upgrade to Maven 3.0.5
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index adf8c78..57f09f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
</distributionManagement>
<properties>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.0.5</mavenVersion>
<javaVersion>7</javaVersion>
<plexusVersion>1.5.4</plexusVersion>
<project.build.outputTimestamp>2020-06-08T20:00:25Z</project.build.outputTimestamp>
@@ -116,17 +116,17 @@
<version>3.1.0</version><!-- do not upgrade to 3.2.0+ because it adds Xpp3Dom.getInputLocation(): see MSHARED-921 -->
</dependency>
- <!-- Sonatype Aether for Maven 3.0.x -->
+ <!-- Sonatype Aether for Maven 3.0.5 -->
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
- <version>1.7</version>
+ <version>1.13.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-util</artifactId>
- <version>1.7</version>
+ <version>1.13.1</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.aether</groupId>
@@ -194,7 +194,7 @@
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
- <version>1.7</version>
+ <version>1.13.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -236,7 +236,7 @@
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
- <version>2.2.0</version>
+ <version>2.3.0</version>
<scope>provided</scope>
</dependency>