Merge remote-tracking branch 'origin/master' into m2e-self-hosting

Conflicts:
	com.ning.async-http-client/pom.xml
	org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF
	org.eclipse.m2e.archetype.common/pom.xml
	org.eclipse.m2e.core.ui/pom.xml
	org.eclipse.m2e.core/pom.xml
	org.eclipse.m2e.discovery/pom.xml
	org.eclipse.m2e.editor.xml/pom.xml
	org.eclipse.m2e.editor/pom.xml
	org.eclipse.m2e.feature/pom.xml
	org.eclipse.m2e.integration.tests.common/pom.xml
	org.eclipse.m2e.jdt/pom.xml
	org.eclipse.m2e.launching/pom.xml
	org.eclipse.m2e.lifecyclemapping.defaults/pom.xml
	org.eclipse.m2e.logback.appender/pom.xml
	org.eclipse.m2e.logback.configuration/pom.xml
	org.eclipse.m2e.logback.feature/pom.xml
	org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF
	org.eclipse.m2e.maven.indexer/pom.xml
	org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
	org.eclipse.m2e.maven.runtime/pom.xml
	org.eclipse.m2e.model.edit/pom.xml
	org.eclipse.m2e.refactoring/pom.xml
	org.eclipse.m2e.scm/pom.xml
	org.eclipse.m2e.sdk.feature/pom.xml
	org.eclipse.m2e.site/pom.xml
	org.eclipse.m2e.tests.common/pom.xml
	org.eclipse.m2e.usagedata/pom.xml
	org.jboss.netty/pom.xml
	pom.xml
	target-platform/pom.xml

3 files changed, 6 insertions, 12 deletions

diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
index 24d0d7cd..752d5dff 100644
--- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.m2e.discovery/pom.xml b/org.eclipse.m2e.discovery/pom.xml
index bec81abc..df1d0575 100644
--- a/org.eclipse.m2e.discovery/pom.xml
+++ b/org.eclipse.m2e.discovery/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.eclipse.m2e</groupId>
     <artifactId>m2e-core</artifactId>
-    <version>1.0.100-SNAPSHOT</version>
+    <version>1.0.200-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.m2e.discovery</artifactId>
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryWizard.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryWizard.java
index e660b724..3793e826 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryWizard.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryWizard.java
@@ -15,9 +15,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.equinox.internal.p2.discovery.Catalog;
 import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogPage;
 import org.eclipse.equinox.internal.p2.ui.discovery.wizards.DiscoveryWizard;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.m2e.internal.discovery.MavenDiscoveryIcons;
 import org.eclipse.m2e.internal.discovery.Messages;
 import org.eclipse.ui.statushandlers.StatusManager;
@@ -42,13 +39,10 @@ public class MavenDiscoveryWizard extends DiscoveryWizard {
     try {
       return MavenDiscoveryUi.install(getCatalogPage().getInstallableConnectors(), null, getContainer());
     } catch(CoreException e) {
-      IWizardPage page = getContainer().getCurrentPage();
-      if (page instanceof WizardPage) {
-        ((WizardPage) page).setMessage(e.getMessage(), IMessageProvider.ERROR);
-      } else {
-        // This should never happen, but just in case.
-        StatusManager.getManager().handle(e.getStatus(), StatusManager.SHOW | StatusManager.LOG);
-      }
+      // https://bugs.eclipse.org/bugs/show_bug.cgi?id=344592
+      // users need to be able to troubleshoot installation failures, so let them see all the details
+      // TODO meaningful slf4j log
+      StatusManager.getManager().handle(e.getStatus(), StatusManager.SHOW | StatusManager.BLOCK | StatusManager.LOG);
       return false;
     }
   }