Skip to content

Commit

Permalink
Merge pull request #377 from jfdenise/glow-only
Browse files Browse the repository at this point in the history
Enforce overwriteProvisionedServer when layers discovery is enabled
  • Loading branch information
jamezp authored Sep 11, 2023
2 parents 9352aeb + 3a76601 commit 84fd9e1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions plugin/src/main/java/org/wildfly/plugin/dev/DevMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,10 @@ public class DevMojo extends AbstractServerStartMojo {
/**
* Set to {@code true} if you want to delete the existing server referenced from the {@code provisioningDir} and provision a
* new one,
* otherwise {@code false}.
* otherwise {@code false}. When { @code discover-provisioning-info } is set to {@code true}, this option is enforced to be
* {@code true}.
* When discovery of Galleon provisioning information is enabled, a change to the application source code
* could imply re-provisioning of the server.
*/
@Parameter(alias = "overwrite-provisioned-server", defaultValue = "false", property = PropertyNames.WILDFLY_PROVISIONING_OVERWRITE_PROVISIONED_SERVER)
private boolean overwriteProvisionedServer;
Expand Down Expand Up @@ -386,8 +389,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
} else {
if (isDiscoveryEnabled()) {
if (!overwriteProvisionedServer) {
throw new MojoExecutionException(
"When layer discovery is enabled, overwriteProvisionedServer must be set to true");
overwriteProvisionedServer = true;
getLog().info("Layer discovery has been enabled, overwriteProvisionedServer has been set to true");
}
} else {
context = startServer(ServerType.STANDALONE);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

<!-- galleon properties -->
<version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
<version.org.wildfly.glow>1.0.0.Alpha1</version.org.wildfly.glow>
<version.org.wildfly.glow>1.0.0.Alpha4</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>
Expand Down

0 comments on commit 84fd9e1

Please sign in to comment.