Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="http://maven.apache.org/shared/maven-archiver/index.html">Maven
* Archiver Reference</a>.
Expand Down Expand Up @@ -534,7 +526,6 @@ public void buildWebapp(MavenProject mavenProject, File webapplicationDirectory)
this.artifactFactory,
resourceEncoding,
propertiesEncoding,
useJvmChmod,
failOnMissingWebXml,
outputTimestamp);

Expand Down Expand Up @@ -594,8 +585,6 @@ private class DefaultWarPackagingContext implements WarPackagingContext {

private boolean filteringDeploymentDescriptors;

private boolean useJvmChmod;

private final Boolean failOnMissingWebXml;

private final Collection<String> outdatedResources;
Expand All @@ -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
*/
Expand All @@ -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;
Expand All @@ -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()) {
Expand Down Expand Up @@ -817,11 +803,6 @@ public String getPropertiesEncoding() {
return propertiesEncoding;
}

@Override
public boolean isUseJvmChmod() {
return useJvmChmod;
}

@Override
public Boolean isFailOnMissingWebXml() {
return failOnMissingWebXml;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down