svn commit: r1354665 - in /maven/plugins/trunk/maven-shade-plugin: pom.xml src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

[bi...@apache.org]

Author: bimargulies
Date: Wed Jun 27 18:51:17 2012
New Revision: 1354665

URL: http://svn.apache.org/viewvc?rev=1354665&view=rev
Log:
MSHADE-103: maven-shade-plugin does not resolve from user-defined repositories
 o note: trunk now requires Maven 3.0.

Modified:
    maven/plugins/trunk/maven-shade-plugin/pom.xml
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.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=1354665&r1=1354664&r2=1354665&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Wed Jun 27 18:51:17 2012
@@ -30,7 +30,7 @@ under the License.
   </parent>
 
   <artifactId>maven-shade-plugin</artifactId>
-  <version>1.7.2-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Maven Shade Plugin</name>
@@ -54,7 +54,7 @@ under the License.
   </issueManagement>
 
   <properties>
-    <mavenVersion>2.0.6</mavenVersion>
+    <mavenVersion>3.0</mavenVersion>
     <currentVersion>${project.version}</currentVersion>
   </properties>
 
@@ -72,7 +72,12 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
+      <artifactId>maven-core</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
     <dependency>

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=1354665&r1=1354664&r2=1354665&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 Wed Jun 27 18:51:17 2012
@@ -27,6 +27,7 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.Model;
@@ -40,10 +41,13 @@ import org.apache.maven.plugins.shade.po
 import org.apache.maven.plugins.shade.relocation.Relocator;
 import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
 import org.apache.maven.plugins.shade.resource.ResourceTransformer;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.ProjectBuildingResult;
 import org.apache.maven.shared.dependency.tree.DependencyNode;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
@@ -125,7 +129,15 @@ public class ShadeMojo
      * @required
      * @readonly
      */
-    private MavenProjectBuilder mavenProjectBuilder;
+    private ProjectBuilder projectBuilder;
+
+    /**
+     * The current Maven session.
+     *
+     * @parameter default-value="${session}"
+     * @readonly
+     */
+    private MavenSession session;
 
     /**
      * The artifact metadata source to use.
@@ -932,15 +944,19 @@ public class ShadeMojo
                     w.close();
                 }
 
-                MavenProject p2 = mavenProjectBuilder.build( f, localRepository, null );
-                modified = updateExcludesInDeps( p2, dependencies, transitiveDeps );
+                ProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
+                projectBuildingRequest.setLocalRepository(localRepository);
+                projectBuildingRequest.setRemoteRepositories(remoteArtifactRepositories);
+
+                ProjectBuildingResult result = projectBuilder.build(f, projectBuildingRequest);
 
+                modified = updateExcludesInDeps( result.getProject(), dependencies, transitiveDeps );
             }
 
             project.setFile( dependencyReducedPomLocation );
         }
     }
-    
+
     private String getId( Artifact artifact )
     {
         return getId( artifact.getGroupId(), artifact.getArtifactId(), artifact.getType(), artifact.getClassifier() );