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 | 11 |
1 files changed, 3 insertions, 8 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 5873db262d9..1bbdfc9914a 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,16 +59,11 @@ public class ApplicationMojo extends AbstractMojo { if ( ! applicationDestination.exists()) return; - // 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 + ")"); + if (vespaversion == null) // Get the build version of the parent project unless specifically set. + vespaversion = project.getProperties().getProperty("vespaversion"); String metaData = String.format("{\"compileVersion\": \"%s\",\n \"buildTime\": %d}", - compileVersion, + vespaversion, System.currentTimeMillis()); try { Files.write(applicationDestination.toPath().resolve("build-meta.json"), |