From 6462f70185137cc6dc0907f268d5756d5f00f74c Mon Sep 17 00:00:00 2001 From: Trevor Crawford Date: Thu, 8 Sep 2022 12:29:25 -0400 Subject: [PATCH] Write generated features to target; add feature gen as a step for liberty-assembly --- .../io/openliberty/tools/maven/server/GenerateFeaturesMojo.java | 2 +- .../src/main/resources/META-INF/plexus/components.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java index 5ab70aeab..abeba7a77 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java @@ -253,7 +253,7 @@ private void generateFeatures() throws MojoExecutionException, PluginExecutionEx } log.debug("Features detected by binary scanner which are not in server.xml" + missingLibertyFeatures); - File newServerXmlSrc = new File(configDirectory, GENERATED_FEATURES_FILE_PATH); + File newServerXmlSrc = new File("target/liberty/wlp/usr/servers/defaultServer/", GENERATED_FEATURES_FILE_PATH); File serverXml = findConfigFile("server.xml", serverXmlFile); ServerConfigXmlDocument doc = getServerXmlDocFromConfig(serverXml); log.debug("Xml document we'll try to update after generate features doc=" + doc + " file=" + serverXml); diff --git a/liberty-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/liberty-maven-plugin/src/main/resources/META-INF/plexus/components.xml index 5198feb5c..51895ec66 100644 --- a/liberty-maven-plugin/src/main/resources/META-INF/plexus/components.xml +++ b/liberty-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -41,6 +41,7 @@ :liberty-maven-plugin:install-server, io.openliberty.tools:liberty-maven-plugin:create, + io.openliberty.tools:liberty-maven-plugin:generate-features, io.openliberty.tools:liberty-maven-plugin:install-feature, @@ -86,4 +87,3 @@ -