From 13bd50e7fa136ae5148e80abdbe5792f80491695 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Tue, 26 Nov 2024 11:10:31 +0100 Subject: [PATCH] Fix for WFMP-282, Allow to set spaces in the Glow configuration --- .../org/wildfly/plugin/provision/GlowConfig.java | 16 ++++++++++++++++ .../plugin/provision/PackageServerMojo.java | 3 +++ pom.xml | 2 +- 3 files changed, 20 insertions(+), 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 index 67716747..da62969c 100644 --- 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 addOns = Set.of(); + private Set spaces = Set.of(); private String version; private boolean suggest; private Set 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 addOns) { this.addOns = Set.copyOf(addOns); } + /** + * @return the spaces + */ + public Set getSpaces() { + return spaces; + } + + /** + * @param spaces the spaces to set + */ + public void setSpaces(Set 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 index 9d1904fb..b0c942cd 100644 --- 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 { *
  • version: server version. Default being the latest released version.
  • *
  • 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}.
  • + *
  • 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.
  • * * * diff --git a/pom.xml b/pom.xml index 22b10858..03122327 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 6.0.4.Final - 1.1.1.Final + 1.2.0.Beta1 true 1.2.1.Final