diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-19 21:41:37 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-21 16:43:50 +0200 |
commit | fb30ff0eb42b07210a1b75837d44a353a3c46a14 (patch) | |
tree | 1f0efd02691e95945b0fa310ea3db5b5c9f9f245 /vespa-application-maven-plugin | |
parent | c8ec2484db4a81b49ec628e0eb2d091a209c1297 (diff) |
This module contains no Scala code
Diffstat (limited to 'vespa-application-maven-plugin')
-rw-r--r-- | vespa-application-maven-plugin/pom.xml | 30 | ||||
-rw-r--r-- | vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java | 5 |
2 files changed, 11 insertions, 24 deletions
diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 57ef584ece0..2464c8208ad 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -40,11 +40,6 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> @@ -54,23 +49,16 @@ <build> <plugins> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> <configuration> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-explaintypes</arg> - </args> + <source>1.8</source> + <target>1.8</target> + <compilerArgs> + <arg>-Xlint:all</arg> + <arg>-Xlint:-processing</arg> + <arg>-Werror</arg> + </compilerArgs> </configuration> </plugin> <plugin> 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 8aa5c1bb761..9002340478b 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 @@ -5,7 +5,6 @@ import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -22,10 +21,10 @@ import java.util.List; /** * @author tonytv */ -@Mojo(name = "packageApplication", defaultPhase = LifecyclePhase.PACKAGE) +@Mojo(name = "packageApplication", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true) public class ApplicationMojo extends AbstractMojo { - @Component + @Parameter( defaultValue = "${project}", readonly = true ) protected MavenProject project; @Parameter(defaultValue = "src/main/application") |