aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-08-02 10:48:55 +0200
committerjonmv <venstad@gmail.com>2022-08-02 10:48:55 +0200
commit6980735af2719db76a0430455daf09bd10768dfe (patch)
tree29a9737948eb1ed24e77b02e0cbe6c1464d983b6
parentccd2818a152e44396f15cb399fe851f10c350368 (diff)
Copy user bundles to test package as well
-rw-r--r--hosted-tenant-base/pom.xml6
-rw-r--r--vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java15
-rw-r--r--vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Version.java1
3 files changed, 14 insertions, 8 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index 8bc98cf0733..58ad178794b 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -340,6 +340,12 @@
<delete dir="target/application-test/src" />
<copy file="target/${project.artifactId}-tests.jar" todir="target/application-test/components/" />
+
+ <!-- Copy any additional application bundles to the test package -->
+ <copy todir="target/application-test/components">
+ <fileset dir="target/application/components" includes="*.jar" excludes="${project.artifactId}-deploy.jar" />
+ </copy>
+
<zip destfile="target/application-test.zip" basedir="target/application-test/" />
</tasks>
</configuration>
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 6b50ea4b360..2883191cc0a 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
@@ -76,17 +76,18 @@ public class ApplicationMojo extends AbstractMojo {
throw new IllegalArgumentException("compile version (" + compileVersion + ") cannot be higher than parent version (" + parentVersion + ")");
}
- String metaData = String.format("{\n" +
- " \"compileVersion\": \"%s\",\n" +
- " \"buildTime\": %d,\n" +
- " \"parentVersion\": %s\n" +
- "}",
+ String metaData = String.format("""
+ {
+ "compileVersion": "%s",
+ "buildTime": %d,
+ "parentVersion": %s
+ }
+ """,
compileVersion,
System.currentTimeMillis(),
parentVersion == null ? null : "\"" + parentVersion + "\"");
try {
- Files.write(applicationDestination.toPath().resolve("build-meta.json"),
- metaData.getBytes(StandardCharsets.UTF_8));
+ Files.writeString(applicationDestination.toPath().resolve("build-meta.json"), metaData);
}
catch (IOException e) {
throw new MojoExecutionException("Failed writing compile version and build time.", e);
diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Version.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Version.java
index 050871043ca..bf7180f6705 100644
--- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Version.java
+++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Version.java
@@ -3,7 +3,6 @@ package com.yahoo.container.plugin.mojo;
import java.util.Comparator;
import java.util.Objects;
-import static java.lang.Integer.min;
import static java.lang.Integer.parseInt;
/**