From 0ed52636ee33bd18d7328877f7c2eb64858a4440 Mon Sep 17 00:00:00 2001 From: Joao Ferreira Date: Mon, 20 Oct 2025 14:46:25 +0200 Subject: [PATCH] Revert "chore: remove unused Apache Commons Logging dependency" This reverts commit b5ce76400737630ee64619b20d2167477f310bb0. --- .../META-INF/MANIFEST.MF | 3 ++- com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF | 1 + com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF | 1 + com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 3 ++- com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF | 1 + com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF index dc24e904a1..e6a58eb5b7 100644 --- a/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF @@ -18,7 +18,8 @@ Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport, org.eclipse.compare, com.avaloq.tools.ddk.check.runtime.core, org.apache.log4j -Import-Package: org.apache.log4j +Import-Package: org.apache.commons.logging, + org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.avaloq.tools.ddk.check.ui.contentassist.antlr, com.avaloq.tools.ddk.check.ui.internal, diff --git a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF index 58310e0349..10a9984eb4 100644 --- a/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF @@ -6,6 +6,7 @@ Bundle-Version: 16.2.0.qualifier Bundle-SymbolicName: com.avaloq.tools.ddk.check.test.runtime;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;visibility:=reexport, + org.apache.commons.logging;resolution:=optional;visibility:=reexport, org.eclipse.xtext.xtext.generator, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, diff --git a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF index 118cda3c3c..872eaf164d 100644 --- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtend, org.eclipse.xtend.typesystem.emf, org.eclipse.xtext.xtext.generator, + org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, org.eclipse.emf.mwe2.launch;resolution:=optional, diff --git a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF index 7dc71960b5..070d75b39b 100644 --- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtend, org.eclipse.xtend.typesystem.emf, org.eclipse.xtext.xtext.generator, + org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, org.eclipse.emf.mwe2.launch;resolution:=optional, diff --git a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF index e32b9ecd97..8073797302 100644 --- a/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport, com.avaloq.tools.ddk.xtext.generator;visibility:=reexport, org.eclipse.osgi, com.avaloq.tools.ddk.xtext, - org.eclipse.jdt.core;visibility:=reexport + org.eclipse.jdt.core;visibility:=reexport, + org.apache.commons.logging Import-Package: org.apache.logging.log4j,org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.avaloq.tools.ddk.xtext.format.generator diff --git a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF index bbce627957..15c8c112ab 100644 --- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xtext.generator, + org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, org.eclipse.emf.mwe2.launch;resolution:=optional, diff --git a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF index 8fc4e36448..8aa158a6c3 100644 --- a/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.valid/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xtext.generator;resolution:=optional, + org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, org.eclipse.emf.mwe2.launch;resolution:=optional,