diff options
2 files changed, 3 insertions, 2 deletions
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java index 9aaf06aa357..3b75d9dcb7d 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java @@ -22,4 +22,5 @@ public class GenerateSourcesMojoTest { System.out.println("defaultConfigGenVersion = " + actual); assertEquals(expected, actual); } + } 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 bc6a1a78969..62bb5c53f8c 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 @@ -79,11 +79,11 @@ public class ApplicationMojo extends AbstractMojo { String metaData = String.format("{\n" + " \"compileVersion\": \"%s\",\n" + " \"buildTime\": %d,\n" + - " \"parentVersion\": \"%s\"\n" + + " \"parentVersion\": %s\n" + "}", compileVersion, System.currentTimeMillis(), - parentVersion); + parentVersion == null ? null : "\"" + parentVersion + "\""); try { Files.write(applicationDestination.toPath().resolve("build-meta.json"), metaData.getBytes(StandardCharsets.UTF_8)); |