Merge pull request #341 from WonderCsabo/340_platformProvidedDepsNotRemoved

Fix not removed platform provided dependencies

Author: rgladwell

me.gladwell.eclipse.m2e.android.test/src/me/gladwell/eclipse/m2e/android/test/ApplicationAndroidMavenPluginTest.java

@@ -122,7 +122,7 @@ public void testConfigureAddsCompileDependenciesToClasspath() throws Exception {
     }
 
     public void testConfigureDoesNotAddPlatformDependencyToClasspath() throws Exception {
-        assertClasspathDoesNotContain(javaProject, "android-2.3.3.jar");
+        assertClasspathDoesNotContain(javaProject, "android-4.3.1_r3.jar");
     }
 
     public void testConfigureDoesNotAddPlatformProvidedDependenciesToClasspath() throws Exception {

me.gladwell.eclipse.m2e.android/src/main/java/me/gladwell/eclipse/m2e/android/configuration/PrunePlatformProvidedDependenciesClasspathLoader.java

@@ -18,6 +18,8 @@
 import me.gladwell.eclipse.m2e.android.project.MavenAndroidProject;
 
 import org.apache.maven.project.MavenProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -46,8 +48,9 @@ public Iterable<IClasspathEntry> load(IJavaProject project) throws FileNotFoundE
 
         IMavenProjectFacade facade = projectRegistry.getProject(project.getProject());
         if(facade != null) {
-            MavenProject mavenProject = facade.getMavenProject();
-            if (mavenProject != null) {
+            try {
+                MavenProject mavenProject = facade.getMavenProject(new NullProgressMonitor());
+                
                 final MavenAndroidProject androidProject = mavenProjectFactory.createAndroidProject(mavenProject);
                 final List<String> platformProvidedDependencies = androidProject.getPlatformProvidedDependencies();
 
@@ -65,6 +68,8 @@ public boolean apply(IClasspathEntry entry) {
 
                     return prunedNonRuntimeDependencies;
                 }
+            } catch (CoreException e) {
+                throw new ProjectConfigurationException(e);
             }
         } else {
             warn("maven project not yet registered for " + project);