Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-01-30 11:29:02 -0500
committerIgor Fedorenko2012-01-30 11:29:02 -0500
commitefb3321f577286b50d6a7c24c31ff4c42c8597a5 (patch)
treedded90f7813ef9e49542babef354994100fbf289
parent365ae44816ae205ebe21e5e89ed5ee4588027f4b (diff)
downloadm2e-core-efb3321f577286b50d6a7c24c31ff4c42c8597a5.tar.gz
m2e-core-efb3321f577286b50d6a7c24c31ff4c42c8597a5.tar.xz
m2e-core-efb3321f577286b50d6a7c24c31ff4c42c8597a5.zip
338252 require slf4j 1.6.2, ship slf4j 1.6.4 and logback 1.0.0
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--m2e-maven-runtime/com.ning.async-http-client/pom.xml2
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml5
-rw-r--r--org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.discovery/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.editor/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.jdt/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.launching/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.scm/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.site/feature.xml27
-rw-r--r--pom.xml6
14 files changed, 37 insertions, 23 deletions
diff --git a/m2e-maven-runtime/com.ning.async-http-client/pom.xml b/m2e-maven-runtime/com.ning.async-http-client/pom.xml
index 96445e1d..0fc216ab 100644
--- a/m2e-maven-runtime/com.ning.async-http-client/pom.xml
+++ b/m2e-maven-runtime/com.ning.async-http-client/pom.xml
@@ -54,7 +54,7 @@
<Import-Package>
!org.apache.commons.httpclient.*,
org.jboss.netty.*;resolution:=mandatory,
- org.slf4j.*;resolution:=mandatory,
+ org.slf4j.*;version="1.6.2";resolution:=mandatory,
*
</Import-Package>
</instructions>
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
index 44aa9fb1..084ab452 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
@@ -175,7 +175,10 @@
<Import-Package>
!*
</Import-Package>
- <Require-Bundle>com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)"</Require-Bundle>
+ <Require-Bundle>
+ com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)",
+ org.slf4j.api;bundle-version="1.6.2"
+ </Require-Bundle>
<Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
</instructions>
diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index 285977d2..1d8de2a9 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.core.filesystem;bundle-version="1.2.1",
org.eclipse.core.expressions;bundle-version="3.4.101",
org.eclipse.ui.forms;bundle-version="3.4.1",
- org.slf4j.api;bundle-version="1.6.1",
+ org.slf4j.api;bundle-version="1.6.2",
org.eclipse.jface.text,
org.eclipse.ui
Import-Package: org.eclipse.compare.rangedifferencer,
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index b259c881..b03b8c0d 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle:
org.eclipse.m2e.maven.runtime;bundle-version="[1.1.0,1.2.0)",
org.eclipse.m2e.archetype.common;bundle-version="[1.1.0,1.2.0)",
org.eclipse.m2e.maven.indexer;bundle-version="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1",
+ org.slf4j.api;bundle-version="1.6.2",
com.ning.async-http-client;bundle-version="[1.6.3,1.6.4)"
Eclipse-LazyStart: true
Bundle-ClassPath: .
diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
index 7629c1f9..e592dfee 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="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1",
+ org.slf4j.api;bundle-version="1.6.2",
org.eclipse.m2e.maven.runtime;bundle-version="[1.1.0,1.2.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 1c66e968..a76d30ab 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="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1"
+ org.slf4j.api;bundle-version="1.6.2"
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 8b8da810..dbb566ad 100644
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.m2e.maven.runtime;bundle-version="[1.1.0,1.2.0)",
org.eclipse.m2e.editor.xml;bundle-version="[1.1.0,1.2.0)",
org.eclipse.m2e.core.ui;bundle-version="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1",
+ org.slf4j.api;bundle-version="1.6.2",
org.eclipse.wst.common.emf,
org.eclipse.swt,
org.eclipse.jface,
diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
index 7d590b10..8b35a769 100644
--- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.workbench,
org.eclipse.m2e.maven.runtime;bundle-version="[1.1.0,1.2.0)",
org.eclipse.m2e.core;bundle-version="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1",
+ org.slf4j.api;bundle-version="1.6.2",
org.eclipse.m2e.core.ui;bundle-version="[1.1.0,1.2.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 2ef8d4e4..c7db5964 100644
--- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.m2e.core;bundle-version="[1.1.0,1.2.0)",
com.ibm.icu;bundle-version="4.0.1",
org.eclipse.m2e.core.ui;bundle-version="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1",
+ org.slf4j.api;bundle-version="1.6.2",
org.eclipse.jdt.debug
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
index cf4c27f9..c1942c0b 100644
--- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ 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.24",
ch.qos.logback.core;bundle-version="0.9.24",
- org.slf4j.api;bundle-version="1.6.1"
+ org.slf4j.api;bundle-version="1.6.2"
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 162b181d..818f7271 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="[1.1.0,1.2.0)",
org.eclipse.ltk.core.refactoring,
org.eclipse.ltk.ui.refactoring;visibility:=reexport,
org.eclipse.m2e.core.ui;bundle-version="[1.1.0,1.2.0)",
- org.slf4j.api;bundle-version="1.6.1"
+ org.slf4j.api;bundle-version="1.6.2"
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 18e1bf0f..60e7062c 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.6.1"
+ org.slf4j.api;bundle-version="1.6.2"
diff --git a/org.eclipse.m2e.site/feature.xml b/org.eclipse.m2e.site/feature.xml
index 4640b73f..df2f21c3 100644
--- a/org.eclipse.m2e.site/feature.xml
+++ b/org.eclipse.m2e.site/feature.xml
@@ -17,31 +17,36 @@
id="org.eclipse.m2e.logback.feature"
version="0.0.0"/>
- <plugin id="org.slf4j.api"
+ <plugin
+ id="org.slf4j.api"
download-size="0"
install-size="0"
- version="1.6.1"
+ version="1.6.4"
fragment="true"
unpack="false"/>
-
- <plugin id="ch.qos.logback.core"
+
+ <plugin
+ id="ch.qos.logback.core"
download-size="0"
install-size="0"
- version="0.9.27"
+ version="1.0.0"
fragment="true"
unpack="false"/>
-
- <plugin id="ch.qos.logback.classic"
+
+ <plugin
+ id="ch.qos.logback.classic"
download-size="0"
install-size="0"
- version="0.9.27"
+ version="1.0.0"
fragment="true"
unpack="false"/>
-
- <plugin id="ch.qos.logback.slf4j"
+
+ <plugin
+ id="ch.qos.logback.slf4j"
download-size="0"
install-size="0"
- version="0.9.27"
+ version="1.0.0"
fragment="true"
unpack="false"/>
+
</feature>
diff --git a/pom.xml b/pom.xml
index 777ce760..44c7781b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,12 @@
<layout>p2</layout>
<url>${eclipse-repo.url}</url>
</repository>
+ <repository>
+ <!-- 338252 slf4j 1.6.4 and logback 1.0.0 -->
+ <id>orbit</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20120123151124/repository/</url>
+ </repository>
<repository>
<releases>

Back to the top