You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2017/02/20 19:14:07 UTC
servicemix-maven-plugins git commit: [SM-3174] use annotations in
depends-maven-plugin instead doclets
Repository: servicemix-maven-plugins
Updated Branches:
refs/heads/master a4ce96067 -> 3c95e367a
[SM-3174] use annotations in depends-maven-plugin instead doclets
Project: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/commit/3c95e367
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/tree/3c95e367
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/diff/3c95e367
Branch: refs/heads/master
Commit: 3c95e367ac035580cf84454ee5cc5d2e6eba54ca
Parents: a4ce960
Author: Mario Krizmanic <ma...@gmail.com>
Authored: Wed Nov 30 22:02:41 2016 +0100
Committer: Mario Krizmanic <ma...@gmail.com>
Committed: Wed Nov 30 22:02:41 2016 +0100
----------------------------------------------------------------------
depends-maven-plugin/pom.xml | 22 ++++++
.../depends/GenerateDependsFileMojo.java | 80 ++++++--------------
2 files changed, 45 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/3c95e367/depends-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/depends-maven-plugin/pom.xml b/depends-maven-plugin/pom.xml
index 00cbe88..5b41a24 100644
--- a/depends-maven-plugin/pom.xml
+++ b/depends-maven-plugin/pom.xml
@@ -21,6 +21,22 @@
<version>1.3.2-SNAPSHOT</version>
<name>Apache ServiceMix :: Plugins :: Maven2 Depends Plugin</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.5</version>
+ <executions>
+ <execution>
+ <id>default-descriptor</id>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -33,6 +49,12 @@
<version>2.0.9</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0</version>
http://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins/blob/3c95e367/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
----------------------------------------------------------------------
diff --git a/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java b/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
index b97aa8b..55a0b17 100644
--- a/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
+++ b/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
@@ -33,105 +33,71 @@ import org.apache.maven.model.Dependency;
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;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
* Generates the dependencies properties file
- *
- * @version $Id: $
- * @goal generate-depends-file
- * @phase generate-resources
- * @requiresDependencyResolution test
- * @description Generates the dependencies properties file
*/
+@Mojo( name = "generate-depends-file", defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
+ requiresDependencyResolution = ResolutionScope.TEST )
public class GenerateDependsFileMojo extends AbstractMojo {
protected static final String SEPARATOR = "/";
/**
* The maven project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
*/
+ @Parameter( defaultValue = "${project}", required = true, readonly = true )
protected MavenProject project;
- /**
- *
- * @parameter expression='true'
- * @required
- */
+ @Parameter( required = true, defaultValue = "true" )
protected boolean recursive;
-
- /**
- *
- * @parameter expression='true'
- */
+
+ @Parameter( defaultValue = "true" )
protected boolean includeVersion;
- /**
- *
- * @parameter expression='true'
- */
+ @Parameter( defaultValue = "true" )
protected boolean includeClassifier;
- /**
- *
- * @parameter expression='true'
- */
+ @Parameter( defaultValue = "true" )
protected boolean includeScope;
- /**
- *
- * @parameter expression='true'
- */
+ @Parameter( defaultValue = "true" )
protected boolean includeType;
/**
* The file to generate
- *
- * @parameter default-value="${project.build.directory}/classes/META-INF/maven/dependencies.properties"
*/
-
+ @Parameter( defaultValue = "${project.build.directory}/classes/META-INF/maven/dependencies.properties" )
private File outputFile;
-
- /**
- * @parameter default-value="${localRepository}"
- */
+
+ @Parameter( defaultValue = "${localRepository}" )
protected ArtifactRepository localRepo;
- /**
- * @parameter default-value="${project.remoteArtifactRepositories}"
- */
+ @Parameter( defaultValue = "${project.remoteArtifactRepositories}" )
protected List remoteRepos;
- /**
- * @parameter expression="${filterGroupIds}"
- */
+ @Parameter( defaultValue = "${filterGroupIds}" )
protected String[] filterGroupIds;
- /**
- * @component
- */
+ @Component
protected ArtifactMetadataSource artifactMetadataSource;
- /**
- * @component
- */
+ @Component
protected ArtifactResolver resolver;
protected ArtifactCollector collector = new DefaultArtifactCollector();
- /**
- * @component
- */
+ @Component
protected ArtifactFactory factory;
- /**
- * @component
- */
+ @Component
private BuildContext buildContext;
public void execute() throws MojoExecutionException, MojoFailureException {