From df51233ba78545d7707b3d864b2ea79790bdf3f6 Mon Sep 17 00:00:00 2001 From: Andrzej Jarmoniuk Date: Thu, 25 Aug 2022 10:28:00 +0200 Subject: [PATCH] Fix for issue #648: de-shadowing the localRepository property --- .../invoker.properties | 3 ++ .../it-abstract-versions-report-001/pom.xml | 33 +++++++++++++++++++ .../verify.groovy | 15 +++++++++ .../mojo/versions/AbstractVersionsReport.java | 14 +++----- 4 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 src/it/it-abstract-versions-report-001/invoker.properties create mode 100644 src/it/it-abstract-versions-report-001/pom.xml create mode 100644 src/it/it-abstract-versions-report-001/verify.groovy diff --git a/src/it/it-abstract-versions-report-001/invoker.properties b/src/it/it-abstract-versions-report-001/invoker.properties new file mode 100644 index 000000000..a60d6037e --- /dev/null +++ b/src/it/it-abstract-versions-report-001/invoker.properties @@ -0,0 +1,3 @@ +invoker.goals.1=${project.groupId}:${project.artifactId}:${project.version}:dependency-updates-report + +invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:plugin-updates-report \ No newline at end of file diff --git a/src/it/it-abstract-versions-report-001/pom.xml b/src/it/it-abstract-versions-report-001/pom.xml new file mode 100644 index 000000000..06cb3eb64 --- /dev/null +++ b/src/it/it-abstract-versions-report-001/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + localhost + it-abstract-versions-report-001 + 1.0 + pom + abstract-versions-report + http://localhost/ + + + Testing command line invocation of dependency- and plugin-updates-report + + + + + localhost + dummy-api + 1.1 + + + + + + + localhost + dummy-maven-plugin + 1.0 + + + + + diff --git a/src/it/it-abstract-versions-report-001/verify.groovy b/src/it/it-abstract-versions-report-001/verify.groovy new file mode 100644 index 000000000..da937db0c --- /dev/null +++ b/src/it/it-abstract-versions-report-001/verify.groovy @@ -0,0 +1,15 @@ +dependencyUpdatesReport = new File( basedir, "target/site/dependency-updates-report.html" ) + +assert dependencyUpdatesReport.exists( ) + +// some basic (=not comprehensive) checks on the contents of the dependency report +assert dependencyUpdatesReport.text =~ /\b1\.1\.0-2\b/ // current version of the dependency +assert dependencyUpdatesReport.text =~ /\b3\.0\b/ // latest major available version + +pluginUpdatesReport = new File( basedir, "target/site/plugin-updates-report.html" ) + +assert pluginUpdatesReport.exists( ) + +// some basic (=not comprehensive) checks on the contents of the plugin report +assert pluginUpdatesReport.text =~ /\b1\.0\b/ // current version of the plugin +assert pluginUpdatesReport.text =~ /\b3\.1\b/ // latest major available version \ No newline at end of file diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java index bb3b81e90..61fb7b63b 100644 --- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java +++ b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java @@ -19,6 +19,10 @@ * under the License. */ +import java.io.File; +import java.util.List; +import java.util.Locale; + import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; @@ -44,10 +48,6 @@ import org.codehaus.mojo.versions.api.VersionsHelper; import org.codehaus.plexus.i18n.I18N; -import java.io.File; -import java.util.List; -import java.util.Locale; - /** * Base class for all versions reports. * @@ -102,12 +102,6 @@ public abstract class AbstractVersionsReport @Parameter( defaultValue = "${project.pluginArtifactRepositories}", readonly = true ) protected List remotePluginRepositories; - /** - * @since 1.0-alpha-1 - */ - @Parameter( defaultValue = "${localRepository}", readonly = true ) - protected ArtifactRepository localRepository; - /** * @since 1.0-alpha-3 */