Write generated features to target; add feature gen as a step for lib…

…erty-assembly
TrevCraw · Sep 8, 2022 · 6462f70 · 6462f70
1 parent 98c7615
commit 6462f70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java b/...ty-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
@@ -41,6 +41,7 @@
                             <prepare-package>
                                 :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,
                             </prepare-package>
                             <package>
@@ -86,4 +87,3 @@
 
     </components>
 </component-set>
-