Skip to content

Commit 1c0877c

Browse files
author
Vincent Potucek
committed
Add method AbstractMojo#mkDirForParentFile(File) central fix try can use automatic resource management
1 parent e19aa49 commit 1c0877c

61 files changed

Lines changed: 79 additions & 337 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.apache.maven.plugin;
2020

21+
import java.io.File;
2122
import java.util.Map;
2223

2324
import org.apache.maven.plugin.logging.Log;
@@ -185,4 +186,12 @@ public Map getPluginContext() {
185186
public void setPluginContext(Map pluginContext) {
186187
this.pluginContext = pluginContext;
187188
}
189+
190+
protected File mkDirForParentFile(File file) {
191+
getLog().info("Creating output file " + file);
192+
if (file.getParentFile().mkdirs()) {
193+
getLog().info("Created output file " + file);
194+
}
195+
return file;
196+
}
188197
}

its/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
8585
getLog().info("[MAVEN-CORE-IT-LOG] Creating output file: " + file);
8686

8787
try {
88-
file.getParentFile().mkdirs();
88+
mkDirForParentFile(file);
8989
file.createNewFile();
9090
} catch (IOException e) {
9191
throw new MojoExecutionException("Output file could not be created: " + file, e);

its/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void execute() throws MojoExecutionException {
6969
getLog().info("[MAVEN-CORE-IT-LOG] Creating output file: " + file);
7070

7171
try {
72-
file.getParentFile().mkdirs();
72+
mkDirForParentFile(file);
7373
file.createNewFile();
7474
} catch (IOException e) {
7575
throw new MojoExecutionException("Output file could not be created: " + file, e);

its/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ public class ItMojo extends AbstractMojo {
5353

5454
public void execute() throws MojoExecutionException {
5555
try {
56-
outputFile.getParentFile().mkdirs();
57-
outputFile.createNewFile();
56+
mkDirForParentFile(outputFile).createNewFile();
5857
} catch (IOException e) {
5958
throw new MojoExecutionException("Failed to create touch file: " + e.getMessage(), e);
6059
}

its/core-it-suite/src/test/resources/mng-3372/direct-using-prefix/plugin/src/main/java/org/plugin/TestMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
4545
File outFile = new File(buildDir, "out.txt");
4646
FileWriter writer = null;
4747
try {
48-
outFile.getParentFile().mkdirs();
48+
mkDirForParentFile(outFile);
4949

5050
writer = new FileWriter(outFile);
5151
writer.write("Test");

its/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void execute() throws MojoExecutionException {
162162

163163
FileWriter w = null;
164164
try {
165-
touchFile.getParentFile().mkdirs();
165+
mkDirForParentFile(file);
166166
w = new FileWriter(touchFile);
167167

168168
w.write(runtimeInformation.getApplicationVersion().toString());

its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void execute() throws MojoExecutionException {
5757
File pomFile = project.getFile();
5858

5959
File movedPomFile = new File(project.getBuild().getDirectory(), "pom.xml");
60-
movedPomFile.getParentFile().mkdirs();
60+
mkDirForParentFile(file);
6161

6262
try {
6363
FileUtils.copyFile(pomFile, movedPomFile);

its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class TestMojo extends AbstractMojo {
6060
public void execute() throws MojoExecutionException {
6161
try {
6262
File file = new File(project.getBasedir(), "configuration.txt");
63-
file.getParentFile().mkdirs();
63+
mkDirForParentFile(file);
6464
Writer w = new OutputStreamWriter(new FileOutputStream(file, true), "UTF-8");
6565
try {
6666
w.write(name);

its/core-it-suite/src/test/resources/mng-5783-plugin-dependency-filtering/plugin/src/main/java/org/apache/maven/its/mng5783/plugin/TestMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class TestMojo extends AbstractMojo {
6161
public void execute() throws MojoExecutionException {
6262
try {
6363
File file = new File(target, "dependencies.txt");
64-
file.getParentFile().mkdirs();
64+
mkDirForParentFile(file);
6565
BufferedWriter w = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"));
6666
try {
6767
for (Artifact artifact : artifacts) {

its/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class TestMojo extends AbstractMojo {
7676

7777
public void execute() throws MojoExecutionException {
7878
File file = new File(project.getBasedir(), "configuration.txt");
79-
file.getParentFile().mkdirs();
79+
mkDirForParentFile(file);
8080

8181
Writer w = null;
8282

0 commit comments

Comments
 (0)