Merge pull request #598 from jfdenise/glow_spaces

Fix for WFMP-282, Allow to set spaces in the Glow configuration
wildfly · Nov 26, 2024 · 5fa181e · 5fa181e
2 parents b53f273 + 13bd50e
commit 5fa181e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/plugin/src/main/java/org/wildfly/plugin/provision/GlowConfig.java b/plugin/src/main/java/org/wildfly/plugin/provision/GlowConfig.java
@@ -25,6 +25,7 @@ public class GlowConfig {
     private String context = "bare-metal";
     private String profile;
     private Set<String> addOns = Set.of();
+    private Set<String> spaces = Set.of();
     private String version;
     private boolean suggest;
     private Set<String> layersForJndi = Set.of();
@@ -46,6 +47,7 @@ public Arguments toArguments(Path deployment, Path inProvisioning, String layers
                 .setTechPreview(preview)
                 .setExcludeArchivesFromScan(excludedArchives)
                 .setVerbose(verbose)
+                .setSpaces(spaces)
                 .setOutput(OutputFormat.PROVISIONING_XML);
         if (inProvisioning != null) {
             builder.setProvisoningXML(inProvisioning);
@@ -98,6 +100,20 @@ public void setAddOns(Set<String> addOns) {
         this.addOns = Set.copyOf(addOns);
     }
 
+    /**
+     * @return the spaces
+     */
+    public Set<String> getSpaces() {
+        return spaces;
+    }
+
+    /**
+     * @param spaces the spaces to set
+     */
+    public void setSpaces(Set<String> spaces) {
+        this.spaces = Set.copyOf(spaces);
+    }
+
     /**
      * @return the version
      */

diff --git a/plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java b/plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java
@@ -207,6 +207,9 @@ public class PackageServerMojo extends AbstractProvisionServerMojo {
      * <li>version: server version. Default being the latest released version.</li>
      * <li>ignoreDeployment: The deployment will be not analyzed. A server based on the configured add-ons and the default base
      * layer is provisioned. Default to {@code false}.</li>
+     * <li>spaces: List of spaces to enable. A space brings extra galleon feature-packs to the provisioning (eg:
+     * {@code incubating} to
+     * include the feature-packs that are in the incubating state.</li>
      *
      * </ul>
      * </div>

diff --git a/pom.xml b/pom.xml
@@ -114,7 +114,7 @@
 
         <!-- galleon properties -->
         <version.org.jboss.galleon>6.0.4.Final</version.org.jboss.galleon>
-        <version.org.wildfly.glow>1.1.1.Final</version.org.wildfly.glow>
+        <version.org.wildfly.glow>1.2.0.Beta1</version.org.wildfly.glow>
         <plugin.fork.embedded>true</plugin.fork.embedded>
         <!-- used by tests -->
         <version.org.jboss.logging.slf4j-jboss-logging>1.2.1.Final</version.org.jboss.logging.slf4j-jboss-logging>