339034: Failed to load "SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" during install

13 files changed, 41 insertions, 14 deletions

diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index d92504f3..69abd3c2 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.5.2",
  org.eclipse.core.expressions;bundle-version="3.4.101",
  org.eclipse.search;bundle-version="3.5.1",
  org.eclipse.ui.forms;bundle-version="3.4.1",
- org.slf4j.api;bundle-version="1.5.11",
+ org.slf4j.api;bundle-version="1.6.1",
  org.eclipse.ui
 Import-Package: org.eclipse.ltk.core.refactoring,
  org.eclipse.ltk.core.refactoring.resource,
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index e8fbda69..65e98a5b 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle:
  org.eclipse.m2e.maven.indexer;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)",
  com.ibm.icu;bundle-version="4.0.1",
- org.slf4j.api;bundle-version="1.5.11",
+ org.slf4j.api;bundle-version="1.6.1",
  com.ning.async-http-client;bundle-version="[1.6.0,1.6.1)",
  org.jboss.netty;bundle-version="3.2.3"
 Eclipse-LazyStart: true
diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
index 1157bd53..aaf0e501 100644
--- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.equinox.p2.ui.discovery,
  org.eclipse.equinox.p2.core,
  org.eclipse.equinox.p2.metadata,
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
- org.slf4j.api;bundle-version="1.5.11",
+ org.slf4j.api;bundle-version="1.6.1",
  org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.equinox.p2.repository,
  org.eclipse.equinox.p2.ui
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
index 3bd5a2ab..af366792 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
  org.eclipse.ui.forms,
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
 Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
  org.eclipse.m2e.editor.xml.internal;x-internal:=true,
  org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
index 7e02623a..a370b8e1 100644
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.m2e.editor.xml;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
index 4cf64436..25e0f345 100644
--- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.ui.console,
- org.slf4j.api;bundle-version="1.5.11",
+ org.slf4j.api;bundle-version="1.6.1",
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)"
 Eclipse-LazyStart: true
 Bundle-Activator: org.eclipse.m2e.jdt.MavenJdtPlugin
diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
index 05951e55..de871e0f 100644
--- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)",
  com.ibm.icu;bundle-version="4.0.1",
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
index c12b700a..4e0c9877 100644
--- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.m2e.logback.configuration;singleton:=true
 Bundle-Version: 0.13.0.qualifier
 Bundle-Activator: org.eclipse.m2e.logback.configuration.LogPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
- ch.qos.logback.classic;bundle-version="0.9.19",
- ch.qos.logback.core;bundle-version="0.9.19",
- org.slf4j.api;bundle-version="1.5.11"
+ ch.qos.logback.classic;bundle-version="0.9.24",
+ ch.qos.logback.core;bundle-version="0.9.24",
+ org.slf4j.api;bundle-version="1.6.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
index 19079578..18ca4544 100644
--- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.ltk.core.refactoring,
  org.eclipse.ltk.ui.refactoring;visibility:=reexport,
  org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF
index a0c1a06c..96a8963e 100644
--- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.2",
  org.eclipse.ui.workbench;bundle-version="3.5.2",
  org.eclipse.ui.ide;bundle-version="3.5.1",
  org.eclipse.jdt.core;bundle-version="3.5.2";resolution:=optional,
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
diff --git a/org.eclipse.m2e.site/feature.xml b/org.eclipse.m2e.site/feature.xml
index f9f0c19c..e477211c 100644
--- a/org.eclipse.m2e.site/feature.xml
+++ b/org.eclipse.m2e.site/feature.xml
@@ -17,4 +17,31 @@
          id="org.eclipse.m2e.logback.feature"
          version="0.0.0"/>
 
+   <plugin id="org.slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="1.6.1"
+         fragment="true"
+         unpack="false"/>
+         
+   <plugin id="ch.qos.logback.core"
+         download-size="0"
+         install-size="0"
+         version="0.9.24"
+         fragment="true"
+         unpack="false"/>
+         
+   <plugin id="ch.qos.logback.classic"
+         download-size="0"
+         install-size="0"
+         version="0.9.24"
+         fragment="true"
+         unpack="false"/>
+         
+   <plugin id="ch.qos.logback.slf4j"
+         download-size="0"
+         install-size="0"
+         version="0.9.24"
+         fragment="true"
+         unpack="false"/>
 </feature>
diff --git a/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF b/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF
index 445e75ba..90013380 100644
--- a/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.slf4j.bridge/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.13.0.qualifier
 Bundle-Activator: org.eclipse.m2e.internal.slf4j.bridge.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF b/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF
index 318ff862..e687268b 100644
--- a/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.usagedata/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.m2e.usagedata;singleton:=true
 Bundle-Version: 0.13.0.qualifier
 Require-Bundle: org.eclipse.epp.usagedata.gathering;resolution:=optional,
  org.eclipse.m2e.core,
- org.slf4j.api;bundle-version="1.5.11"
+ org.slf4j.api;bundle-version="1.6.1"
 Import-Package: org.eclipse.core.runtime,
  org.osgi.framework
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,