[eclipse/xtext#2028] replace log4j Require-Bundle with Import-Package

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
rubenporras · Jan 24, 2022 · 00ae3da · 00ae3da
1 parent c99389e
commit 00ae3da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF
@@ -23,7 +23,9 @@ Export-Package: org.eclipse.xtext.junit4,
  org.eclipse.xtext.junit4.ui.util;x-friends:="org.eclipse.xtext.common.types.eclipse.tests",
  org.eclipse.xtext.junit4.util,
  org.eclipse.xtext.junit4.validation
-Import-Package: org.junit;version="4.12.0",
+Import-Package: org.apache.log4j;version="1.2.15";resolution:=optional,
+ org.apache.log4j.spi;version="1.2.15";resolution:=optional,
+ org.junit;version="4.12.0",
  org.junit.internal;version="4.12.0",
  org.junit.internal.builders;version="4.12.0",
  org.junit.rules;version="4.12.0";resolution:=optional,
@@ -39,7 +41,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.jdt.core;bundle-version="3.13.102";resolution:=optional;x-installation:=greedy,
  org.eclipse.jdt.ui;bundle-version="3.13.100";resolution:=optional,
  org.eclipse.jdt.launching;bundle-version="3.9.100";resolution:=optional;x-installation:=greedy,
- org.apache.log4j;bundle-version="1.2.15";resolution:=optional,
  org.eclipse.xtext.xbase.lib;resolution:=optional,
  org.eclipse.xtend.lib;resolution:=optional,
  org.eclipse.xtext.builder.standalone,

diff --git a/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.ui.testing.util
-Import-Package: org.junit;version="4.12.0",
+Import-Package: org.apache.log4j;version="1.2.15";resolution:=optional,
+ org.junit;version="4.12.0",
  org.junit.internal;version="4.12.0",
  org.junit.internal.builders;version="4.12.0",
  org.junit.jupiter.api;version="[5.0.0,6.0.0)";resolution:=optional,
@@ -24,7 +25,6 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.jdt.core;bundle-version="3.13.102";resolution:=optional;x-installation:=greedy,
  org.eclipse.jdt.ui;bundle-version="3.13.100";resolution:=optional,
  org.eclipse.jdt.launching;bundle-version="3.9.100";resolution:=optional;x-installation:=greedy,
- org.apache.log4j;bundle-version="1.2.15";resolution:=optional,
  org.eclipse.xtext.builder.standalone,
  org.eclipse.emf.codegen.ecore;bundle-version="2.20.0";resolution:=optional,
  org.eclipse.pde.core;bundle-version="3.11.100";resolution:=optional,