svn commit: r1722726 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java

[rf...@apache.org]

Author: rfscholte
Date: Sun Jan  3 14:38:14 2016
New Revision: 1722726

URL: http://svn.apache.org/viewvc?rev=1722726&view=rev
Log:
Remove invalidateProccessedProjectCache(), DefaultMavenProjectBuilder isn't used anymore for building the MavenProject

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java?rev=1722726&r1=1722725&r2=1722726&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java Sun Jan  3 14:38:14 2016
@@ -27,7 +27,6 @@ import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.lang.reflect.Field;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -53,9 +52,7 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment;
 import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
-import org.apache.maven.project.DefaultMavenProjectBuilder;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.artifact.TransferUtils;
 import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
@@ -98,9 +95,6 @@ public class DefaultRepositoryAssembler
     protected ArtifactRepositoryFactory artifactRepositoryFactory;
 
     @Requirement
-    protected MavenProjectBuilder projectBuilder;
-
-    @Requirement
     private DependencyResolver dependencyResolver;
 
     @Requirement
@@ -153,17 +147,6 @@ public class DefaultRepositoryAssembler
             throw new RepositoryAssemblyException( "Error resolving artifacts: " + e.getMessage(), e );
         }
 
-        try
-        {
-            // Blow the cache in the project builder so that we get POMs again
-            // on this next download
-            invalidateProccessedProjectCache();
-        }
-        catch ( Exception e )
-        {
-            throw new RepositoryAssemblyException( "Error invalidating the processed project cache.", e );
-        }
-
         ArtifactFilter filter = buildRepositoryFilter( repository, project );
 
         buildingRequest = repositoryManager.setLocalRepositoryBasedir( buildingRequest, repositoryDirectory );
@@ -448,29 +431,6 @@ public class DefaultRepositoryAssembler
         return localRepository;
     }
 
-    private void invalidateProccessedProjectCache()
-        throws Exception
-    {
-        Class<DefaultMavenProjectBuilder> klass = DefaultMavenProjectBuilder.class;
-
-        try
-        {
-            Field field = klass.getDeclaredField( "processedProjectCache" );
-
-            field.setAccessible( true );
-
-            Object cache = field.get( projectBuilder );
-
-            cache.getClass().getDeclaredMethod( "clear", null ).invoke( cache, null );
-
-            field.setAccessible( false );
-        }
-        catch ( NoSuchFieldException e )
-        {
-            // fine... no field, no cache. we'll ignore it.
-        }
-    }
-
     private void setAlignment( Artifact artifact, Map<String, GroupVersionAlignment> groupVersionAlignments )
     {
         GroupVersionAlignment alignment = groupVersionAlignments.get( artifact.getGroupId() );