aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@yahooinc.com>2022-10-28 16:14:56 +0200
committerMorten Tokle <mortent@yahooinc.com>2022-10-28 16:14:56 +0200
commit195ed5dab937a48c8fa6f69c32c129b13413f8fe (patch)
treef08e0d08fbe4f30b49a85528ac4cd4a53c11e9c6
parent44595d372748d960535e72ab5086fc1412db867c (diff)
Use getSelectedVersion()
-rw-r--r--vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java7
1 files changed, 6 insertions, 1 deletions
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 + ")");
}