From 226b5e1c886b6db21804d0cafbdc706ab0b920ea Mon Sep 17 00:00:00 2001 From: Jeff Mesnil Date: Thu, 6 Oct 2022 16:57:43 +0200 Subject: [PATCH] [WFMP-175] Add property to skip the deployment in the package goal. If wildfly.package.deployment.skip is true, the user deployment will not be deployed in the provisioned server. JIRA: https://issues.redhat.com/browse/WFMP-175 Signed-off-by: Jeff Mesnil --- .../wildfly/plugin/common/PropertyNames.java | 2 ++ .../plugin/provision/PackageServerMojo.java | 33 ++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/plugin/src/main/java/org/wildfly/plugin/common/PropertyNames.java b/plugin/src/main/java/org/wildfly/plugin/common/PropertyNames.java index 9a98c316..8ee0f813 100644 --- a/plugin/src/main/java/org/wildfly/plugin/common/PropertyNames.java +++ b/plugin/src/main/java/org/wildfly/plugin/common/PropertyNames.java @@ -97,6 +97,8 @@ public interface PropertyNames { String SKIP_PACKAGE = "wildfly.package.skip"; + String SKIP_PACKAGE_DEPLOYMENT = "wildfly.package.deployment.skip"; + String STARTUP_TIMEOUT = "wildfly.startupTimeout"; String STDOUT = "wildfly.stdout"; 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 00b9e262..3e2d5856 100644 --- a/plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java +++ b/plugin/src/main/java/org/wildfly/plugin/provision/PackageServerMojo.java @@ -160,6 +160,12 @@ public class PackageServerMojo extends AbstractProvisionServerMojo { @Parameter(defaultValue = "false", property = PropertyNames.SKIP_PACKAGE) private boolean skip; + /** + * Skip deploying the deployment after the server is provisioned ({@code false} by default). + */ + @Parameter(defaultValue = "false", property = PropertyNames.SKIP_PACKAGE) + protected boolean skipDeployment; + @Inject private OfflineCommandExecutor commandExecutor; @@ -198,19 +204,22 @@ protected void serverProvisioned(Path jbossHome) throws MojoExecutionException, throw new MojoExecutionException(ex.getLocalizedMessage(), ex); } - final Path deploymentContent = getDeploymentContent(); - if (Files.exists(deploymentContent)) { - getLog().info("Deploying " + deploymentContent); - List deploymentCommands = getDeploymentCommands(deploymentContent); - final BaseCommandConfiguration cmdConfigDeployment = new BaseCommandConfiguration.Builder() - .addCommands(deploymentCommands) - .setJBossHome(jbossHome) - .addCLIArguments(CLI_ECHO_COMMAND_ARG) - .setAppend(true) - .setStdout(stdout) - .build(); - commandExecutor.execute(cmdConfigDeployment, artifactResolver); + if (!skipDeployment) { + final Path deploymentContent = getDeploymentContent(); + if (Files.exists(deploymentContent)) { + getLog().info("Deploying " + deploymentContent); + List deploymentCommands = getDeploymentCommands(deploymentContent); + final BaseCommandConfiguration cmdConfigDeployment = new BaseCommandConfiguration.Builder() + .addCommands(deploymentCommands) + .setJBossHome(jbossHome) + .addCLIArguments(CLI_ECHO_COMMAND_ARG) + .setAppend(true) + .setStdout(stdout) + .build(); + commandExecutor.execute(cmdConfigDeployment, artifactResolver); + } } + // CLI execution try { if (!packagingScripts.isEmpty()) {