From 195ed5dab937a48c8fa6f69c32c129b13413f8fe Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Fri, 28 Oct 2022 16:14:56 +0200 Subject: Use getSelectedVersion() --- .../main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'vespa-application-maven-plugin/src') diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java index 2883191cc0a..9120d95970d 100644 --- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java +++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java @@ -3,6 +3,7 @@ package com.yahoo.container.plugin.mojo; import org.apache.commons.io.FileUtils; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; @@ -71,7 +72,11 @@ public class ApplicationMojo extends AbstractMojo { Version parentVersion = null; Artifact parentArtifact = current.getParentArtifact(); if (parentArtifact != null && isVespaParent(parentArtifact.getGroupId())) { - parentVersion = Version.from(parentArtifact.getVersion()); + try { + parentVersion = Version.from(parentArtifact.getSelectedVersion().toString()); + } catch (ArtifactResolutionException e) { + parentVersion = Version.from(parentArtifact.getVersion()); + } if (parentVersion.compareTo(compileVersion) < 0) throw new IllegalArgumentException("compile version (" + compileVersion + ") cannot be higher than parent version (" + parentVersion + ")"); } -- cgit v1.2.3