This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch utils in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git
commit f111c18b74d3366d29a920e33e9f99ad5ce91c9d Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Thu Jun 11 08:35:44 2020 -0400 update maven-shared-utils --- pom.xml | 2 +- .../apache/maven/reporting/exec/DefaultMavenReportExecutor.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 87560fc..bb18e80 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> - <version>0.3</version> + <version>3.2.1</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> 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 1682073..a878647 100644 --- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java +++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.apache.maven.lifecycle.LifecycleExecutor; @@ -45,11 +46,11 @@ import org.apache.maven.plugin.version.PluginVersionResolver; import org.apache.maven.plugin.version.PluginVersionResult; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.MavenReport; +import org.apache.maven.shared.utils.StringUtils; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.logging.Logger; -import org.apache.maven.shared.utils.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomUtils; @@ -649,8 +650,8 @@ public class DefaultMavenReportExecutor } for ( Plugin plugin : plugins ) { - if ( StringUtils.equals( plugin.getArtifactId(), reportPlugin.getArtifactId() ) - && StringUtils.equals( plugin.getGroupId(), reportPlugin.getGroupId() ) ) + if ( Objects.equals( plugin.getArtifactId(), reportPlugin.getArtifactId() ) + && Objects.equals( plugin.getGroupId(), reportPlugin.getGroupId() ) ) { return plugin; }
