aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-04-20 08:28:37 +0200
committerjonmv <venstad@gmail.com>2022-04-20 08:31:31 +0200
commita539f34d4e1788183484b17b38a7cb6339f2386d (patch)
tree2c4e56fbf72f2e13033d05656709d9fc72443171 /vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
parent1123977d8bc6a8fe4ca420eb102657bf034ff631 (diff)
Revert "Merge pull request #22155 from vespa-engine/revert-22124-jonmv/require-compile-version-leq-parent"
This reverts commit ddd16fd9efba8428e0d62430550e8741dcf696b8, reversing changes made to d6ac310e295206ec2f88a9a3c8d2a0ebbbb46b37.
Diffstat (limited to 'vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java')
-rw-r--r--vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java11
1 files changed, 8 insertions, 3 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 1bbdfc9914a..5873db262d9 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
@@ -59,11 +59,16 @@ public class ApplicationMojo extends AbstractMojo {
if ( ! applicationDestination.exists())
return;
- if (vespaversion == null) // Get the build version of the parent project unless specifically set.
- vespaversion = project.getProperties().getProperty("vespaversion");
+ // Compile version is the build version of the parent project, unless specifically set.
+ MavenProject parent = project;
+ while (parent.getParent() != null) parent = parent.getParent();
+ Version parentVersion = Version.from(parent.getVersion());
+ Version compileVersion = vespaversion == null ? parentVersion : Version.from(vespaversion);
+ if (parentVersion.compareTo(compileVersion) < 0)
+ throw new IllegalArgumentException("compile version (" + compileVersion + ") cannot be higher than parent version (" + parentVersion + ")");
String metaData = String.format("{\"compileVersion\": \"%s\",\n \"buildTime\": %d}",
- vespaversion,
+ compileVersion,
System.currentTimeMillis());
try {
Files.write(applicationDestination.toPath().resolve("build-meta.json"),