Merge pull request #460 from jfdenise/WFMP-234

Fix for WFMP-234, Allows to exclude some archives when scanning with …
wildfly · Dec 21, 2023 · dba73a6 · dba73a6
2 parents 898cfa7 + 1d1a336
commit dba73a6
Show file tree

Hide file tree

Showing 2 changed files with 21 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 version;
     private boolean suggest;
     private Set<String> layersForJndi = Set.of();
+    private Set<String> excludedArchives = Set.of();
     private boolean failsOnError = true;
     private boolean preview;
 
@@ -38,6 +39,7 @@ public Arguments toArguments(Path deployment, Path inProvisioning) {
                 .setUserEnabledAddOns(addOns).setBinaries(lst).setSuggest(suggest).setJndiLayers(getLayersForJndi())
                 .setVersion(version)
                 .setTechPreview(preview)
+                .setExcludeArchivesFromScan(excludedArchives)
                 .setOutput(OutputFormat.PROVISIONING_XML);
         if (inProvisioning != null) {
             builder.setProvisoningXML(inProvisioning);
@@ -156,4 +158,18 @@ public void setPreview(boolean preview) {
     public boolean isPreview() {
         return preview;
     }
+
+    /**
+     * @return the excludedArchives
+     */
+    public Set<String> getExcludedArchives() {
+        return excludedArchives;
+    }
+
+    /**
+     * @param excludedArchives the excludedArchives to set
+     */
+    public void setExcludedArchives(Set<String> excludedArchives) {
+        this.excludedArchives = Set.copyOf(excludedArchives);
+    }
 }
diff --git a/plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java b/plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java
@@ -191,12 +191,16 @@ public class PackageServerMojo extends AbstractProvisionServerMojo {
      * <li>profile: {@code ha}. Default being non ha server configuration.</li>
      * <li>suggest: {@code true} | {@code false}. Display addOns that you can use to enhance discovered provisioning
      * configuration. Default to {@code false}.</li>
+     * <li>excludedArchives: List of archives contained in the deployment to exclude when scanning.
+     * Wildcards ({@code *}) are allowed. N.B. Just the name of the archive is matched, do not attempt
+     * to specify a full path within the jar. The following examples would be valid exclusions: {@code my-jar.jar},
+     * {@code *-internal.rar}.</li>
      * <li>version: server version. Default being the latest released version.</li>
      *
      * </ul>
      * </div>
      *
-     * For example, cloud, ha profile with CLI and openapi addOns enabled. mail layer eing explicitly included:
+     * For example, cloud, ha profile with CLI and openapi addOns enabled. mail layer being explicitly included:
      *
      * <pre>
      *   &lt;discover-provisioning-info&gt;