From 3a40b02626d1a76592454cf605091b0ade58fdec Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Mon, 6 May 2019 15:23:17 +0200 Subject: Use override value of vespaversion when this is set --- .../com/yahoo/container/plugin/mojo/ApplicationMojo.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'vespa-application-maven-plugin') 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 c8c12a21d8a..48e371767ee 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 @@ -24,9 +24,12 @@ import java.util.List; @Mojo(name = "packageApplication", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true) public class ApplicationMojo extends AbstractMojo { - @Parameter( defaultValue = "${project}", readonly = true ) + @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; + @Parameter(property = "vespaversion") + private String vespaversion; + @Parameter(defaultValue = "src/main/application") private String sourceDir; @@ -51,14 +54,16 @@ public class ApplicationMojo extends AbstractMojo { } } - /** Writes meta data about this package if the destination directory exists, and the "vespaversion" property is set. */ + /** Writes meta data about this package if the destination directory exists. */ private void addBuildMetaData(File applicationDestination) throws MojoExecutionException { - String compileVersion = project.getProperties().getProperty("vespaversion"); - if ( ! applicationDestination.exists() || compileVersion == null) + if ( ! applicationDestination.exists()) return; + 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"), -- cgit v1.2.3