diff options
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.java | 9 |
1 files changed, 6 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..101114db106 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,14 @@ 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. + Version parentVersion = Version.from(project.getParent().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"), |