Infers a JVM model from the source model.
diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/util/CheckUtil.java b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/util/CheckUtil.java index 84def2a38a..98b62524aa 100644 --- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/util/CheckUtil.java +++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/util/CheckUtil.java @@ -10,8 +10,8 @@ *******************************************************************************/ package com.avaloq.tools.ddk.check.util; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.WordUtils; import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorStandaloneSetup; @@ -69,6 +69,6 @@ public static String serviceRegistryClassName() { * @return the issue code name for the given issue name. */ public static String toIssueCodeName(final String issueName) { - return StringUtils.remove(WordUtils.capitalizeFully(issueName, new char[] {'_'}), '_'); + return StringUtils.remove(WordUtils.capitalizeFully(issueName, '_'), '_'); } } diff --git a/com.avaloq.tools.ddk.check.ide/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ide/META-INF/MANIFEST.MF index bb67bf0c46..ef6ab45902 100644 --- a/com.avaloq.tools.ddk.check.ide/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.ide/META-INF/MANIFEST.MF @@ -16,6 +16,5 @@ Require-Bundle: com.avaloq.tools.ddk.check.core, org.eclipse.xtext.xbase.ide Export-Package: com.avaloq.tools.ddk.check.ide.contentassist.antlr, com.avaloq.tools.ddk.check.ide.contentassist.antlr.internal -Import-Package: org.apache.log4j, - org.apache.logging.log4j +Import-Package: org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.check.ide diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF index cb153e3bb1..8aad6e2959 100644 --- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.xtext, org.eclipse.xtext.xbase.lib, - org.apache.commons.lang, + org.apache.commons.lang3, com.avaloq.tools.ddk.xtext, com.avaloq.tools.ddk Export-Package: com.avaloq.tools.ddk.check.runtime, diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProvider.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProvider.java index a1307f7ad1..60fe7c1802 100644 --- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProvider.java +++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProvider.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -51,7 +51,7 @@ public class CheckRuleLabelProvider implements ICheckRuleLabelProvider { public String getLabel(final String issueCode) { // Is this a Check? - if (!StringUtils.contains(issueCode, CHECK_ISSUE_CODE_SUBSTRING)) { + if (!Strings.CS.contains(issueCode, CHECK_ISSUE_CODE_SUBSTRING)) { return null; } 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 018877253a..f169b9157b 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 @@ -16,8 +16,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport, org.eclipse.xtext.common.types.ui, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.compare, - com.avaloq.tools.ddk.check.runtime.core, - org.apache.log4j + com.avaloq.tools.ddk.check.runtime.core Import-Package: org.apache.commons.logging, org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-21 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 815a0ef067..a2a54fae64 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 @@ -24,9 +24,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, com.avaloq.tools.ddk.check.lib, com.avaloq.tools.ddk.check.core, org.eclipse.xtext.xbase.lib -Import-Package: org.apache.log4j, - org.apache.logging.log4j, - org.eclipse.xtext.xbase.lib +Import-Package: org.eclipse.xtext.xbase.lib, org.apache.logging.log4j Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.avaloq.tools.ddk.check, com.avaloq.tools.ddk.check.formatting, diff --git a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF index e50c0b2e79..c475c69de2 100644 --- a/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF @@ -29,12 +29,12 @@ Require-Bundle: com.avaloq.tools.ddk.check.ui, Export-Package: com.avaloq.tools.ddk.check.ui.test, com.avaloq.tools.ddk.check.ui.test.util, com.avaloq.tools.ddk.check -Import-Package: org.slf4j, org.apache.log4j, - org.apache.logging.log4j, +Import-Package: org.slf4j, org.hamcrest.core, org.junit.runner;version="4.5.0", org.junit.runner.manipulation;version="4.5.0", org.junit.runner.notification;version="4.5.0", org.junit.runners;version="4.5.0", - org.junit.runners.model;version="4.5.0" + org.junit.runners.model;version="4.5.0", + org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.check.ui.test diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF index 28587340b5..2a4803f1ef 100644 --- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF @@ -40,6 +40,5 @@ Export-Package: com.avaloq.tools.ddk.check.ui;x-friends:="com.avaloq.tools.ddk.c com.avaloq.tools.ddk.check.ui.wizard, com.avaloq.tools.ddk.check.ui.quickfix, com.avaloq.tools.ddk.check.ui.editor -Import-Package: org.apache.log4j, - org.apache.logging.log4j +Import-Package: org.apache.log4j, org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.check.ui diff --git a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF index 6fed15ee62..5fe37f6322 100644 --- a/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.xtext, com.avaloq.tools.ddk.check.core, com.avaloq.tools.ddk.check.runtime.core, org.eclipse.xtext.xbase.lib, - org.apache.logging.log4j, org.objectweb.asm;resolution:=optional, io.github.classgraph.classgraph Export-Package: com.avaloq.tools.ddk.checkcfg, @@ -37,4 +36,4 @@ Export-Package: com.avaloq.tools.ddk.checkcfg, com.avaloq.tools.ddk.checkcfg.validation, com.avaloq.tools.ddk.checkcfg.serializer Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.core -Import-Package: org.apache.log4j +Import-Package: org.apache.log4j, org.apache.logging.log4j diff --git a/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF index 941b944034..4b532c59f9 100644 --- a/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF @@ -20,6 +20,5 @@ Require-Bundle: com.avaloq.tools.ddk.checkcfg.core, org.eclipse.lsp4j Export-Package: com.avaloq.tools.ddk.checkcfg.ide.contentassist.antlr, com.avaloq.tools.ddk.checkcfg.ide.contentassist.antlr.internal -Import-Package: org.apache.log4j, - org.apache.logging.log4j +Import-Package: org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.ide diff --git a/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF index 88f210eb93..6c814c5c10 100644 --- a/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.sample.helloworld.ide/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld, org.eclipse.xtext.ide, com.avaloq.tools.ddk.xtext.ide, com.avaloq.tools.ddk.xtext -Import-Package: org.apache.log4j +Import-Package: org.apache.logging.log4j Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.avaloq.tools.ddk.sample.helloworld.ide, com.avaloq.tools.ddk.sample.helloworld.ide.contentassist.antlr, diff --git a/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF index a4b9cb8d6c..c48639acf1 100644 --- a/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF @@ -36,5 +36,4 @@ Export-Package: com.avaloq.tools.ddk.sample.helloworld.helloWorld, com.avaloq.tools.ddk.sample.helloworld.parser.antlr.internal, com.avaloq.tools.ddk.sample.helloworld.validation, com.avaloq.tools.ddk.sample.helloworld.grammar -Import-Package: org.apache.log4j, - org.apache.logging.log4j +Import-Package: org.apache.logging.log4j diff --git a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF index 0c3eb46688..0473f42e64 100644 --- a/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF @@ -12,17 +12,17 @@ Require-Bundle: org.eclipse.core.runtime, org.junit, org.mockito.mockito-core, com.google.guava, - org.apache.commons.lang, + org.apache.commons.lang3, org.eclipse.emf.common, com.avaloq.tools.ddk, junit-jupiter-api, org.opentest4j, org.eclipse.jdt.annotation +Import-Package: org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.test.core, com.avaloq.tools.ddk.test.core.data, com.avaloq.tools.ddk.test.core.junit.runners, com.avaloq.tools.ddk.test.core.jupiter, com.avaloq.tools.ddk.test.core.mock, com.avaloq.tools.ddk.test.core.util -Import-Package: org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.test.core diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/TestLabelFilter.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/TestLabelFilter.java index e697a379b0..7fcbf0d1b6 100644 --- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/TestLabelFilter.java +++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/TestLabelFilter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package com.avaloq.tools.ddk.test.core; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.junit.runner.Description; import org.junit.runner.manipulation.Filter; diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/TestLabelFilter.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/TestLabelFilter.java index 081565757c..4b618bc9a0 100644 --- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/TestLabelFilter.java +++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/junit/runners/TestLabelFilter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package com.avaloq.tools.ddk.test.core.junit.runners; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.junit.runner.Description; import org.junit.runner.manipulation.Filter; diff --git a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/util/CoreUtilTools.java b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/util/CoreUtilTools.java index d057caa9d3..08127c545f 100644 --- a/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/util/CoreUtilTools.java +++ b/com.avaloq.tools.ddk.test.core/src/com/avaloq/tools/ddk/test/core/util/CoreUtilTools.java @@ -14,7 +14,7 @@ import java.net.UnknownHostException; import java.util.Locale; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.eclipse.core.runtime.Assert; @@ -72,9 +72,9 @@ public static String generateUniqueName(final String namePrefix) { * @return the random string */ public static String randomAlphanumericString(final int count) { - StringBuilder stringBuilder = new StringBuilder(RandomStringUtils.randomAlphabetic(1)); + StringBuilder stringBuilder = new StringBuilder(RandomStringUtils.secure().nextAlphabetic(1)); if (count > 1) { - stringBuilder.append(RandomStringUtils.randomAlphanumeric(count - 1)); + stringBuilder.append(RandomStringUtils.secure().nextAlphanumeric(count - 1)); } String string = stringBuilder.toString(); diff --git a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF index e8d949b794..76e992875d 100644 --- a/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: com.avaloq.tools.ddk.test.core, org.junit, org.mockito.mockito-core, com.google.guava, - org.apache.commons.lang, + org.apache.commons.lang3, org.eclipse.emf.common, com.avaloq.tools.ddk Export-Package: com.avaloq.tools.ddk.test.ui, @@ -28,6 +28,6 @@ Export-Package: com.avaloq.tools.ddk.test.ui, com.avaloq.tools.ddk.test.ui.swtbot, com.avaloq.tools.ddk.test.ui.swtbot.condition, com.avaloq.tools.ddk.test.ui.swtbot.util -Import-Package: org.slf4j, org.apache.logging.log4j,org.apache.log4j +Import-Package: org.slf4j, org.apache.logging.log4j Eclipse-RegisterBuddy: org.eclipse.swtbot.swt.finder Automatic-Module-Name: com.avaloq.tools.ddk.test.ui diff --git a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF index e0e6a069a7..f3ca6c1be4 100644 --- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF @@ -10,10 +10,10 @@ Require-Bundle: org.eclipse.xtext.builder, com.avaloq.tools.ddk.xtext, org.eclipse.xtext.common.types.ui Bundle-RequiredExecutionEnvironment: JavaSE-21 +Import-Package: org.apache.logging.log4j, org.apache.log4j Export-Package: com.avaloq.tools.ddk.xtext.builder, com.avaloq.tools.ddk.xtext.builder.layered, com.avaloq.tools.ddk.xtext.builder.resourceloader, com.avaloq.tools.ddk.xtext.builder.tracing, com.avaloq.tools.ddk.xtext.extensions -Import-Package: org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext.builder diff --git a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF index a3195fa222..2d68f7750a 100644 --- a/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -11,5 +11,4 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.common.types, org.eclipse.xtext.common.types.ui, org.eclipse.xtext.ui Export-Package: com.avaloq.tools.ddk.xtext.common.types.ui.access.jdt -Import-Package: org.apache.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext.common.types.ui diff --git a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF index 7a4c2a0be3..4dfb584942 100644 --- a/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.common.types/META-INF/MANIFEST.MF @@ -12,5 +12,4 @@ Require-Bundle: com.avaloq.tools.ddk.xtext, org.eclipse.xtext, org.eclipse.xtext.common.types Export-Package: com.avaloq.tools.ddk.xtext.common.types.access.jdt -Import-Package: org.apache.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext.common.types diff --git a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF index d5757209c3..6e17d541b5 100644 --- a/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.export.generator/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.export.generator;singleton:=true Bundle-Version: 17.2.0.qualifier Bundle-Vendor: Avaloq Group AG Bundle-RequiredExecutionEnvironment: JavaSE-21 +Import-Package: org.apache.logging.log4j Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xtext.generator, org.eclipse.emf.codegen.ecore;resolution:=optional, @@ -20,6 +21,5 @@ Require-Bundle: org.eclipse.xtext, com.avaloq.tools.ddk.xtext.generator, com.avaloq.tools.ddk.xtext.expression;visibility:=reexport, com.avaloq.tools.ddk.xtext.export;visibility:=reexport -Import-Package: org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.export.generator Automatic-Module-Name: com.avaloq.tools.ddk.xtext.export.generator diff --git a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF index f0e2ab87ad..05dc9bd783 100644 --- a/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF @@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.xtext.ui, com.avaloq.tools.ddk.xtext.ui, org.eclipse.compare, org.eclipse.jdt.ui -Import-Package: org.apache.logging.log4j, - org.apache.log4j +Import-Package: org.apache.log4j, org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.export.ui.contentassist, com.avaloq.tools.ddk.xtext.export.ui.quickfix Automatic-Module-Name: com.avaloq.tools.ddk.xtext.export.ui 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 0023f4085c..068075f415 100644 --- a/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF @@ -25,7 +25,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.core.runtime, org.eclipse.xtext.ui.codetemplates;resolution:=optional, org.eclipse.xtext.xbase.lib -Import-Package: org.apache.log4j Export-Package: com.avaloq.tools.ddk.xtext.export, com.avaloq.tools.ddk.xtext.export.export, com.avaloq.tools.ddk.xtext.export.export.impl, 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 7e06dda1ae..5ec1262668 100644 --- a/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF @@ -24,8 +24,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" -Import-Package: org.apache.logging.log4j, - org.apache.log4j +Import-Package: org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.expression, com.avaloq.tools.ddk.xtext.expression.conversion, com.avaloq.tools.ddk.xtext.expression.expression, 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 4b12a7d081..3142ef907a 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,7 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport, com.avaloq.tools.ddk.xtext, org.eclipse.jdt.core;visibility:=reexport, org.apache.commons.logging -Import-Package: org.apache.logging.log4j,org.apache.log4j +Import-Package: org.apache.logging.log4j Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.avaloq.tools.ddk.xtext.format.generator Automatic-Module-Name: 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 bfc63473ed..b92f22f79e 100644 --- a/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase;visibility:=reexport, org.eclipse.xtext.xbase.lib, org.objectweb.asm;resolution:=optional -Import-Package: org.apache.logging.log4j,org.apache.log4j +Import-Package: org.apache.log4j, org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.format, com.avaloq.tools.ddk.xtext.format.format, com.avaloq.tools.ddk.xtext.format.format.impl, diff --git a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF index a4ed3c4f2a..4b87a62222 100644 --- a/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF @@ -22,6 +22,7 @@ Require-Bundle: org.eclipse.jface, org.eclipse.jdt.core, org.eclipse.compare, org.eclipse.xtext.xbase +Import-Package: org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.generator.builder, com.avaloq.tools.ddk.xtext.generator.ecore, com.avaloq.tools.ddk.xtext.generator.expression, @@ -34,6 +35,5 @@ Export-Package: com.avaloq.tools.ddk.xtext.generator.builder, com.avaloq.tools.ddk.xtext.generator.resourceFactory, com.avaloq.tools.ddk.xtext.generator.ide.contentAssist, com.avaloq.tools.ddk.xtext.generator.parser.common -Import-Package: org.apache.logging.log4j Eclipse-ExtensibleAPI: true Automatic-Module-Name: com.avaloq.tools.ddk.xtext.generator diff --git a/com.avaloq.tools.ddk.xtext.ide/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ide/META-INF/MANIFEST.MF index 082651ad66..a86b485fc0 100644 --- a/com.avaloq.tools.ddk.xtext.ide/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.ide/META-INF/MANIFEST.MF @@ -12,5 +12,4 @@ Bundle-ActivationPolicy: lazy Export-Package: com.avaloq.tools.ddk.xtext.ide.contentAssist, com.avaloq.tools.ddk.xtext.ide.formatting, com.avaloq.tools.ddk.xtext.ide.findrefs -Import-Package: org.apache.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext.ide diff --git a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF index e9404f33e2..44f25e119c 100644 --- a/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.scope.generator/META-INF/MANIFEST.MF @@ -11,5 +11,4 @@ Require-Bundle: com.avaloq.tools.ddk.xtext.scope;visibility:=reexport, com.avaloq.tools.ddk.xtext.generator, org.eclipse.osgi, com.avaloq.tools.ddk.xtext -Import-Package: org.apache.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext.scope.generator diff --git a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF index e507a3e906..c0fcf275aa 100644 --- a/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF @@ -19,8 +19,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.xtext.xbase.lib -Import-Package: org.apache.logging.log4j, - org.apache.log4j +Import-Package: org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.scope, com.avaloq.tools.ddk.xtext.scope.parser.antlr, com.avaloq.tools.ddk.xtext.scope.parser.antlr.internal, diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF index d46e0ead64..47dd4106a2 100644 --- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Require-Bundle: com.avaloq.tools.ddk.xtext, org.eclipse.emf.common, com.avaloq.tools.ddk, junit-jupiter-api -Import-Package: org.slf4j, org.apache.logging.log4j,org.apache.log4j +Import-Package: org.slf4j, org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.test, com.avaloq.tools.ddk.xtext.test.contentassist, com.avaloq.tools.ddk.xtext.test.conversion, diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java index bf2e824731..32ec49db0c 100644 --- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java +++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/PluginTestProjectManager.java @@ -49,7 +49,7 @@ public class PluginTestProjectManager extends XtextTestProjectManager { // org.eclipse.osgi needed for NLS // org.apache.logging.log4j needed for logging in generated StandaloneSetup - private static final List