From e50bbbc26fe6860c535186188c9d08298db5c769 Mon Sep 17 00:00:00 2001 From: Scott Kurz Date: Mon, 16 Sep 2019 12:04:13 -0400 Subject: [PATCH] Use default appsDirectory parm in deploy goal, output dir for package Signed-off-by: Scott Kurz --- .../java/boost/runtimes/openliberty/LibertyRuntime.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/LibertyRuntime.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/LibertyRuntime.java index 007e8803..5cf43aa1 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/LibertyRuntime.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/LibertyRuntime.java @@ -258,15 +258,14 @@ private void installMissingFeatures() throws MojoExecutionException { } /** - * Invoke the liberty-maven-plugin to run the install-app goal. + * Invoke the liberty-maven-plugin to run the deploy goal. */ - private void installApp(String installAppPackagesVal) throws MojoExecutionException { + private void installApp(String deployPackagesVal) throws MojoExecutionException { - Element deployPackages = element(name("deployPackages"), installAppPackagesVal); + Element deployPackages = element(name("deployPackages"), deployPackagesVal); Element serverNameElement = element(name("serverName"), serverName); Xpp3Dom configuration = configuration(deployPackages, serverNameElement, getRuntimeArtifactElement()); - configuration.addChild(element(name("appsDirectory"), "apps").toDom()); executeMojo(getPlugin(), goal("deploy"), configuration, env); } @@ -284,7 +283,6 @@ private Element getRuntimeArtifactElement() { private void createUberJar() throws MojoExecutionException { executeMojo(getPlugin(), goal("package"), configuration(element(name("isInstall"), "false"), element(name("include"), "minify"), - element(name("outputDirectory"), "target/liberty-alt-output-dir"), element(name("packageType"), "jar"), element(name("serverName"), serverName)), env); }