diff --git a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java index 5c14fd72..f76abedd 100644 --- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java +++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java @@ -332,14 +332,6 @@ public abstract class AbstractWarMojo extends AbstractMojo { @Parameter(defaultValue = "false") private boolean supportMultiLineFiltering; - /** - * Use jvmChmod rather that cli chmod and forking process. - * - * @since 2.4 - */ - @Parameter(defaultValue = "true") - private boolean useJvmChmod; - /** * The archive configuration to use. See Maven * Archiver Reference. @@ -534,7 +526,6 @@ public void buildWebapp(MavenProject mavenProject, File webapplicationDirectory) this.artifactFactory, resourceEncoding, propertiesEncoding, - useJvmChmod, failOnMissingWebXml, outputTimestamp); @@ -594,8 +585,6 @@ private class DefaultWarPackagingContext implements WarPackagingContext { private boolean filteringDeploymentDescriptors; - private boolean useJvmChmod; - private final Boolean failOnMissingWebXml; private final Collection outdatedResources; @@ -612,7 +601,6 @@ private class DefaultWarPackagingContext implements WarPackagingContext { * @param artifactFactory the artifact factory * @param resourceEncoding the resource encoding * @param propertiesEncoding the encoding to use for properties files - * @param useJvmChmod use Jvm chmod or not * @param failOnMissingWebXml flag to check whether we should ignore missing web.xml or not * @param outputTimestamp the output timestamp for reproducible archive creation */ @@ -627,7 +615,6 @@ private class DefaultWarPackagingContext implements WarPackagingContext { ArtifactFactory artifactFactory, String resourceEncoding, String propertiesEncoding, - boolean useJvmChmod, final Boolean failOnMissingWebXml, String outputTimestamp) { this.webappDirectory = webappDirectory; @@ -645,7 +632,6 @@ private class DefaultWarPackagingContext implements WarPackagingContext { for (String overlayId : overlayManager.getOverlayIds()) { webappStructure.getStructure(overlayId); } - this.useJvmChmod = useJvmChmod; this.failOnMissingWebXml = failOnMissingWebXml; if (!webappDirectory.exists()) { @@ -817,11 +803,6 @@ public String getPropertiesEncoding() { return propertiesEncoding; } - @Override - public boolean isUseJvmChmod() { - return useJvmChmod; - } - @Override public Boolean isFailOnMissingWebXml() { return failOnMissingWebXml; diff --git a/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java index 09deea34..781444bc 100644 --- a/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java +++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java @@ -214,12 +214,6 @@ public interface WarPackagingContext { */ String getPropertiesEncoding(); - /** - * @return to use jvmChmod rather than forking chmod cli - * @since 2.4 - */ - boolean isUseJvmChmod(); - /** * Returns the flag that switch on/off the missing web.xml validation. * diff --git a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java index cbbdf578..21135b42 100644 --- a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java @@ -68,7 +68,6 @@ protected void configureMojo( throws Exception { setVariableValueToObject(mojo, "filters", filters); setVariableValueToObject(mojo, "mavenFileFilter", lookup(MavenFileFilter.class.getName())); - setVariableValueToObject(mojo, "useJvmChmod", Boolean.TRUE); MavenExecutionRequest request = new DefaultMavenExecutionRequest() .setSystemProperties(System.getProperties())