You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/08/14 19:25:43 UTC
svn commit: r1617998 -
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Author: khmarbaise
Date: Thu Aug 14 17:25:43 2014
New Revision: 1617998
URL: http://svn.apache.org/r1617998
Log:
[MSHADE-177]
- Injection via @Parameter instead of @Component
- Reordered imports.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1617998&r1=1617997&r2=1617998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Thu Aug 14 17:25:43 2014
@@ -19,6 +19,21 @@ package org.apache.maven.plugins.shade.m
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -65,21 +80,6 @@ import org.codehaus.plexus.personality.p
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* Mojo that performs shading delegating to the Shader component.
*
@@ -97,13 +97,13 @@ public class ShadeMojo
/**
* The current Maven session.
*/
- @Component
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
private MavenSession session;
/**
* The current Maven project.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
private MavenProject project;
@Component