You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/03/13 17:13:06 UTC
svn commit: r1300217 - in /maven/plugins/trunk/maven-shade-plugin: ./
src/it/users-shader-impl/ src/main/java/org/apache/maven/plugins/shade/
src/site/apt/examples/ src/test/java/org/apache/maven/plugins/shade/
Author: olamy
Date: Tue Mar 13 16:13:06 2012
New Revision: 1300217
URL: http://svn.apache.org/viewvc?rev=1300217&view=rev
Log:
use plexus annotations rather than javadoc tag.
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties (with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/use-shader-other-impl.apt.vm
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/MockShader.java
Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1300217&r1=1300216&r2=1300217&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Tue Mar 13 16:13:06 2012
@@ -119,6 +119,11 @@ under the License.
<artifactId>jdependency</artifactId>
<version>0.7</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.5.5</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -140,17 +145,18 @@ under the License.
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
- <goal>test-descriptor</goal>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
+
</plugins>
</build>
Added: maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties?rev=1300217&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties Tue Mar 13 16:13:06 2012
@@ -0,0 +1 @@
+invoker.goals=clean package
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1300217&r1=1300216&r2=1300217&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Tue Mar 13 16:13:06 2012
@@ -24,6 +24,7 @@ import org.apache.maven.plugins.shade.fi
import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.resource.ManifestResourceTransformer;
import org.apache.maven.plugins.shade.resource.ResourceTransformer;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.objectweb.asm.ClassReader;
@@ -51,8 +52,8 @@ import java.util.zip.ZipException;
/**
* @author Jason van Zyl
- * @plexus.component instantiation-strategy="per-lookup" role-hint="default"
*/
+@Component( role = Shader.class, hint = "default" )
public class DefaultShader
extends AbstractLogEnabled
implements Shader
Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/use-shader-other-impl.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/use-shader-other-impl.apt.vm?rev=1300217&r1=1300216&r2=1300217&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/use-shader-other-impl.apt.vm (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/use-shader-other-impl.apt.vm Tue Mar 13 16:13:06 2012
@@ -30,26 +30,34 @@ Using your own Shader implementation
Create a standard Maven project with your implementation.
+-----
-/**
- *
- * @plexus.component instantiation-strategy="per-lookup" role-hint="mock"
- */
+
+Dependency to Plexus annotations
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+
+Create your Shader
+
+@Component( role = Shader.class, hint = "mock" )
public class MockShader
implements Shader
{
// implement the interface here
}
-// Use the plexus maven plugin in your job to generate Plexus metadata
+// Use the plexus component metadata plugin in your job to generate Plexus metadata
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.8</version>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>
Modified: maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/MockShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/MockShader.java?rev=1300217&r1=1300216&r2=1300217&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/MockShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/MockShader.java Tue Mar 13 16:13:06 2012
@@ -22,6 +22,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugins.shade.filter.Filter;
import org.apache.maven.plugins.shade.relocation.Relocator;
import org.apache.maven.plugins.shade.resource.ResourceTransformer;
+import org.codehaus.plexus.component.annotations.Component;
import java.io.File;
import java.io.IOException;
@@ -30,8 +31,8 @@ import java.util.Set;
/**
* @author Olivier Lamy
- * @plexus.component instantiation-strategy="per-lookup" role-hint="mock"
*/
+@Component( role = Shader.class, hint = "mock" )
public class MockShader
implements Shader
{
@@ -39,7 +40,6 @@ public class MockShader
List<ResourceTransformer> resourceTransformers )
throws IOException, MojoExecutionException
{
-
System.out.println( "Executing MockShader#shade" );
}
}