diff options
| author | gjoranv <gjoranv@gmail.com> | 2018-10-01 10:57:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 10:57:13 +0200 |
| commit | 1cb9459c3540aed9431b4824f19766555d00d1c3 (patch) | |
| tree | 16da88aeda488c76b449a9835d474ca8aedcb7eb | |
| parent | f56c831ed3839ca8a0390ca70c1864c0e908144e (diff) | |
| parent | 44ea1ad4771a7eb3a6a02fd6e3031a6b3736f291 (diff) | |
Merge pull request #7022 from vespa-engine/jvenstad/remove-antrun-silliness
Replace plugin used for a single mkdir with mkdirs in dependent
| -rw-r--r-- | tenant-base/pom.xml | 20 | ||||
| -rw-r--r-- | vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 806fdc662d1..189a7c5ef7d 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -314,26 +314,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>Create target dir</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <mkdir dir="${project.build.directory}/application"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>vespa-application-maven-plugin</artifactId> <version>${vespaversion}</version> diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java index e70a04d96ed..1d20a06d0da 100644 --- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java +++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java @@ -62,7 +62,7 @@ public class ApplicationMojo extends AbstractMojo { private File createComponentsDir(File applicationDestination) throws MojoExecutionException { File componentsDir = new File(applicationDestination, "components"); - componentsDir.mkdir(); + componentsDir.mkdirs(); if (!componentsDir.exists() || !componentsDir.isDirectory()) { throw new MojoExecutionException("Failed creating components directory (" + componentsDir + ")"); } |