Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2016-06-13 04:18:36 -0400
committerLaurent Goubet2016-06-14 04:14:23 -0400
commita04478a4cfaa41286386aed838dd2112d2ef66d1 (patch)
treea21fdb8016006e17db491823c5c359bcd1849c6d
parent6dfd995b7164e7a69aee10eaaf9858c5fb7c485e (diff)
downloadorg.eclipse.emf.compare-a04478a4cfaa41286386aed838dd2112d2ef66d1.tar.gz
org.eclipse.emf.compare-a04478a4cfaa41286386aed838dd2112d2ef66d1.tar.xz
org.eclipse.emf.compare-a04478a4cfaa41286386aed838dd2112d2ef66d1.zip
[495961] incompatibility between log4j 1.x and 2.x
-rw-r--r--plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF2
5 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
index 17cda9acb..0a300dd19 100644
--- a/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.emf.compare,
org.eclipse.egit.ui;bundle-version="4.2.0"
Import-Package: com.google.common.collect;version="[11.0.0,16.0.0)",
- org.apache.log4j;version="1.2.0"
+ org.apache.log4j;version="[1.2.15,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
index c65b655bf..f0c65a3dc 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
@@ -59,4 +59,4 @@ Import-Package: com.google.common.annotations;version="[11.0.0,16.0.0)",
com.google.common.eventbus;version="[11.0.0,16.0.0)",
com.google.common.io;version="[11.0.0,16.0.0)",
com.google.common.util.concurrent;version="[11.0.0,16.0.0)",
- org.apache.log4j;version="1.2.15"
+ org.apache.log4j;version="[1.2.15,2.0.0)"
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
index 028ea7da1..59af3e592 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
@@ -57,4 +57,4 @@ Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
com.google.common.collect;version="[11.0.0,16.0.0)",
com.google.common.eventbus;version="[11.0.0,16.0.0)",
com.google.common.io;version="[11.0.0,16.0.0)",
- org.apache.log4j;version="1.2.0"
+ org.apache.log4j;version="[1.2.15,2.0.0)"
diff --git a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
index 233d20be1..7a5d72880 100644
--- a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Export-Package: org.eclipse.emf.compare.rcp,
org.eclipse.emf.compare.rcp.policy
Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
com.google.common.collect;version="[11.0.0,16.0.0)",
- org.apache.log4j;version="1.2.0"
+ org.apache.log4j;version="[1.2.15,2.0.0)"
diff --git a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF
index c3346ac4a..650312c11 100644
--- a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF
@@ -43,4 +43,4 @@ Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
com.google.common.cache;version="[11.0.0,16.0.0)",
com.google.common.collect;version="[11.0.0,16.0.0)",
com.google.common.util.concurrent;version="[11.0.0,16.0.0)",
- org.apache.log4j;version="1.2.15"
+ org.apache.log4j;version="[1.2.15,2.0.0)"

Back to the top