Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for WFMP-234, Allows to exclude some archives when scanning with … #460

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Fix for WFMP-234, Allows to exclude some archives when scanning with … #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions plugin/src/main/java/org/wildfly/plugin/provision/GlowConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
}
6 changes: 5 additions & 1 deletion plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down