diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-16 16:34:28 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-16 16:34:28 +0200 |
commit | 137f254cc067ed18d158556c9a219e2d88f1c479 (patch) | |
tree | d01dd7b3227391644ca1079b48056e44d751f3fa | |
parent | 2283777062767f8ac2e6bb7c0cbd310aae5445c3 (diff) |
Use newest version of Maven plugin dependencies
-rw-r--r-- | config-class-plugin/pom.xml | 6 | ||||
-rw-r--r-- | config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 5e1a263cadf..5b3149a13da 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -20,8 +20,8 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.2.1</version> + <artifactId>maven-core</artifactId> + <version>3.5.0</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> - <version>3.2</version> + <version>3.5</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java index b6197bc2eca..9ef68400d9e 100644 --- a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java +++ b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java @@ -2,27 +2,27 @@ package com.yahoo.vespa; import com.yahoo.config.codegen.MakeConfig; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -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; import org.apache.maven.project.MavenProject; -import org.apache.commons.io.FileUtils; import java.io.File; import java.io.FilenameFilter; +import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.ArrayList; /** * Goal which generates config classes from def-files. */ -@org.apache.maven.plugins.annotations.Mojo(name = "config-gen", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true) +@Mojo(name = "config-gen", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true) public class ConfigGenMojo extends AbstractMojo { - @Component + @Parameter( defaultValue = "${project}", readonly = true ) private MavenProject project; /** |