From 7b20062bd1f167e2dc12ff35b65b8a5df8680bec Mon Sep 17 00:00:00 2001 From: "Kristopher J. Limbo" Date: Wed, 25 Mar 2026 11:32:35 +0800 Subject: [PATCH] build: update the Orbit repository --- .../META-INF/MANIFEST.MF | 5 ++-- .../test/AbstractCheckGenerationTestCase.java | 2 +- .../META-INF/MANIFEST.MF | 8 ++--- .../jvmmodel/CheckJvmModelInferrer.xtend | 2 +- .../tools/ddk/check/util/CheckUtil.java | 6 ++-- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 6 ++-- .../runtime/label/CheckRuleLabelProvider.java | 4 +-- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 8 +++-- .../tools/ddk/test/core/TestLabelFilter.java | 2 +- .../core/junit/runners/TestLabelFilter.java | 2 +- .../ddk/test/core/util/CoreUtilTools.java | 6 ++-- .../META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../scope/generator/ScopingFragment2.xtend | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../xtext/test/PluginTestProjectManager.java | 2 +- .../META-INF/MANIFEST.MF | 5 ++-- .../templates/ConfigurableTemplateStore.java | 4 +-- .../WorkbenchMarkerResolutionGenerator.java | 2 +- .../TemplateProposalProviderHelper.xtend | 4 +-- .../ddk/xtext/ui/util/RuntimeProjectUtil.java | 2 +- .../META-INF/MANIFEST.MF | 5 ++-- .../DefaultFormattingDirectiveExecutor.java | 2 +- .../formatting/RegionNodeModelFormatter.java | 2 +- .../AbstractDeclarativeValidValidator.java | 2 +- com.avaloq.tools.ddk/META-INF/MANIFEST.MF | 4 +-- ddk-configuration/launches/devkit-run.launch | 4 +-- ddk-target/ddk.target | 30 +++++++++++-------- 42 files changed, 84 insertions(+), 85 deletions(-) diff --git a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF index ea61578d6a..6118431c8d 100644 --- a/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF @@ -25,8 +25,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.core, org.eclipse.ui.workbench;resolution:=optional, org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib, - org.apache.logging.log4j, - org.apache.commons.lang, + org.apache.commons.lang3, org.eclipse.xtext.xbase.testing, junit-jupiter-api, junit-jupiter-engine, @@ -36,5 +35,5 @@ Export-Package: com.avaloq.tools.ddk.check.core.test, com.avaloq.tools.ddk.check.core.test.util, com.avaloq.tools.ddk.check.test.core, com.avaloq.tools.ddk.check -Import-Package: org.hamcrest.core +Import-Package: org.hamcrest.core, org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.check.core.test diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java index cbd192f421..3b85ecc2df 100644 --- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java +++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; diff --git a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF index 912b177d24..972fbc285a 100644 --- a/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF @@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.jface.text, org.eclipse.xtext.xbase.lib, com.avaloq.tools.ddk.xtext, - org.apache.commons.lang, + org.apache.commons.lang3, + org.apache.commons.text, org.objectweb.asm;resolution:=optional Export-Package: com.avaloq.tools.ddk.check, com.avaloq.tools.ddk.check.check, @@ -46,7 +47,6 @@ Export-Package: com.avaloq.tools.ddk.check, com.avaloq.tools.ddk.check.typing, com.avaloq.tools.ddk.check.util, com.avaloq.tools.ddk.check.validation -Import-Package: org.apache.logging.log4j, - org.eclipse.jdt.internal.ui.text, - org.apache.log4j +Import-Package: org.eclipse.jdt.internal.ui.text, + org.apache.log4j, org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.check.core diff --git a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend index 56af88da6c..f182219f03 100644 --- a/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend +++ b/com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend @@ -66,7 +66,7 @@ import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder import org.eclipse.xtext.xbase.lib.Procedures.Procedure1 import static extension com.avaloq.tools.ddk.check.generator.CheckGeneratorExtensions.* -import static extension org.apache.commons.lang.StringEscapeUtils.escapeJava +import static extension org.apache.commons.text.StringEscapeUtils.escapeJava /** *

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..6fd4722bd7 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.log4j, 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..81b8587d8c 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 @@ -5,11 +5,12 @@ Bundle-SymbolicName: com.avaloq.tools.ddk.check.runtime.core;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.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, @@ -19,8 +20,7 @@ Export-Package: com.avaloq.tools.ddk.check.runtime, com.avaloq.tools.ddk.check.runtime.label, com.avaloq.tools.ddk.check.runtime.quickfix, com.avaloq.tools.ddk.check.runtime.registry, - com.avaloq.tools.ddk.check.runtime.validation -Import-Package: org.apache.logging.log4j + com.avaloq.tools.ddk.check.runtime.validation Bundle-ActivationPolicy: lazy Bundle-Activator: com.avaloq.tools.ddk.check.runtime.internal.Activator Automatic-Module-Name: com.avaloq.tools.ddk.check.runtime.core 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/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF index 815a0ef067..832e4021ef 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 @@ -25,8 +25,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, 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 + 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..cffffc1701 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 @@ -30,11 +30,11 @@ 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, 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..f1af9db462 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.log4j, org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.checkcfg.ide 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..e94de560e9 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.log4j, 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 961a7df24f..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,15 +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 + 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..0c6344059b 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.log4j,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..b8c0ad2a39 100644 --- a/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF @@ -4,6 +4,7 @@ Bundle-Name: com.avaloq.tools.ddk.xtext.builder Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.builder;singleton:=true Bundle-Version: 17.2.0.qualifier Bundle-Vendor: Avaloq Group AG +Import-Package: org.apache.logging.log4j Require-Bundle: org.eclipse.xtext.builder, org.eclipse.xtext.ui, com.avaloq.tools.ddk, @@ -15,5 +16,4 @@ Export-Package: com.avaloq.tools.ddk.xtext.builder, 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.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.expression/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF index 7e06dda1ae..f05ad1fc7e 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.log4j, 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..1a19b1c508 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.log4j, 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.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment2.xtend b/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment2.xtend index 495c668d98..144a429f64 100644 --- a/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment2.xtend +++ b/com.avaloq.tools.ddk.xtext.scope.generator/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingFragment2.xtend @@ -37,8 +37,9 @@ class ScopingFragment2 extends AbstractXtextGeneratorFragment { if (projectConfig.runtime.manifest !== null) { projectConfig.runtime.manifest.requiredBundles += "org.eclipse.emf.ecore" projectConfig.runtime.manifest.requiredBundles += RUNTIME_PLUGIN + projectConfig.runtime.manifest.requiredBundles += "org.apache.logging.log4j.core" + projectConfig.runtime.manifest.requiredBundles += "org.apache.logging.log4j.api" projectConfig.runtime.manifest.exportedPackages += grammar.namespace + ".scoping" - projectConfig.runtime.manifest.importedPackages += "org.apache.logging.log4j" } if (projectConfig.eclipsePlugin.manifest !== null) { 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..9cda92c92f 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.log4j, 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..5b5b005580 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.log4j, 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 REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", "com.avaloq.tools.ddk.xtext", "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.logging.log4j"); + private static final List REQUIRED_BUNDLES = newArrayList("org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.lib", "org.eclipse.emf.ecore", "com.avaloq.tools.ddk.check.core", "com.avaloq.tools.ddk.check.runtime.core", "com.avaloq.tools.ddk.check.lib", "com.avaloq.tools.ddk.xtext", "org.eclipse.xtext", "org.eclipse.osgi", "org.eclipse.xtend", "org.eclipse.core.runtime", "org.eclipse.xtext.xbase", "org.apache.logging.log4j.api"); private final Injector injector; diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF index 9fe65e76f8..c2bf5533a5 100644 --- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF @@ -13,11 +13,13 @@ Require-Bundle: com.avaloq.tools.ddk.xtext, org.eclipse.xtext.xbase.lib, org.eclipse.search, org.eclipse.ui.ide, - org.apache.commons.lang, + org.apache.commons.lang3, + org.apache.commons.text, com.avaloq.tools.ddk.check.runtime.ui;visibility:=reexport, com.google.guava, com.avaloq.tools.ddk.xtext.ide, com.avaloq.tools.ddk +Import-Package: org.apache.logging.log4j Export-Package: com.avaloq.tools.ddk.xtext.ui, com.avaloq.tools.ddk.xtext.ui.editor, com.avaloq.tools.ddk.xtext.ui.editor.findrefs, @@ -32,5 +34,4 @@ Export-Package: com.avaloq.tools.ddk.xtext.ui, com.avaloq.tools.ddk.xtext.ui.templates, com.avaloq.tools.ddk.xtext.ui.util, com.avaloq.tools.ddk.xtext.ui.validation -Import-Package: org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext.ui diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/editor/templates/ConfigurableTemplateStore.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/editor/templates/ConfigurableTemplateStore.java index 80ae7fac7e..5c91d9c746 100644 --- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/editor/templates/ConfigurableTemplateStore.java +++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/editor/templates/ConfigurableTemplateStore.java @@ -15,9 +15,9 @@ import java.io.InputStream; import java.net.URL; -import org.apache.commons.lang.StringUtils; -import org.apache.logging.log4j.Logger; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.templates.ContextTypeRegistry; import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData; diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java index 282ed2eb1c..1d6da3a77f 100644 --- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java +++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/quickfix/WorkbenchMarkerResolutionGenerator.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.stream.StreamSupport; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend index 6ea420acf2..3f965f1487 100644 --- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend +++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend @@ -11,8 +11,8 @@ package com.avaloq.tools.ddk.xtext.ui.templates import com.google.inject.Singleton import java.util.Objects -import org.apache.commons.lang.StringEscapeUtils -import org.apache.commons.lang.Validate +import org.apache.commons.text.StringEscapeUtils +import org.apache.commons.lang3.Validate import org.eclipse.jface.text.templates.Template import org.eclipse.xtext.ui.editor.contentassist.ITemplateProposalProvider diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/util/RuntimeProjectUtil.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/util/RuntimeProjectUtil.java index eaa6e7d660..786f59dc8a 100644 --- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/util/RuntimeProjectUtil.java +++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/util/RuntimeProjectUtil.java @@ -12,7 +12,7 @@ import java.util.NoSuchElementException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.core.resources.IFile; diff --git a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF index 2220390093..67c1477597 100644 --- a/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk.xtext/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-Vendor: Avaloq Group AG Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava, - org.apache.commons.lang, + org.apache.commons.lang3, + org.apache.commons.text, org.eclipse.jdt.annotation, org.eclipse.core.resources, org.eclipse.core.runtime, @@ -44,6 +45,6 @@ Export-Package: com.avaloq.tools.ddk.xtext.build, com.avaloq.tools.ddk.xtext.tracing, com.avaloq.tools.ddk.xtext.util, com.avaloq.tools.ddk.xtext.validation -Import-Package: org.apache.logging.log4j,org.apache.log4j +Import-Package: org.apache.log4j, org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk.xtext diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/DefaultFormattingDirectiveExecutor.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/DefaultFormattingDirectiveExecutor.java index a7aad4a10b..1f67de3190 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/DefaultFormattingDirectiveExecutor.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/DefaultFormattingDirectiveExecutor.java @@ -14,7 +14,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/RegionNodeModelFormatter.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/RegionNodeModelFormatter.java index 3c7bdde4e2..a46504b2b6 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/RegionNodeModelFormatter.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/formatting/RegionNodeModelFormatter.java @@ -12,7 +12,7 @@ import java.io.IOException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.formatting.impl.DefaultNodeModelFormatter; import org.eclipse.xtext.nodemodel.ICompositeNode; diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java index 5dca2ccaa0..fc3ce0f0c1 100644 --- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java +++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java @@ -13,7 +13,7 @@ import java.text.MessageFormat; import java.util.Map; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/com.avaloq.tools.ddk/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk/META-INF/MANIFEST.MF index 34e90847cb..c67b0ab669 100644 --- a/com.avaloq.tools.ddk/META-INF/MANIFEST.MF +++ b/com.avaloq.tools.ddk/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Avaloq Group AG Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava, - org.apache.commons.lang, + org.apache.commons.lang3, org.eclipse.jdt.annotation, org.eclipse.core.resources, org.eclipse.core.runtime, @@ -16,6 +16,6 @@ Export-Package: com.avaloq.tools.ddk.annotations, com.avaloq.tools.ddk.caching, com.avaloq.tools.ddk.util, com.avaloq.tools.ddk.tracing -Import-Package: org.apache.logging.log4j,org.apache.log4j +Import-Package: org.apache.log4j, org.apache.logging.log4j Automatic-Module-Name: com.avaloq.tools.ddk diff --git a/ddk-configuration/launches/devkit-run.launch b/ddk-configuration/launches/devkit-run.launch index d2497f1ff9..e48ba4d75d 100644 --- a/ddk-configuration/launches/devkit-run.launch +++ b/ddk-configuration/launches/devkit-run.launch @@ -41,7 +41,7 @@ - + @@ -294,7 +294,7 @@ - + diff --git a/ddk-target/ddk.target b/ddk-target/ddk.target index ff1fbda722..75884c0d25 100644 --- a/ddk-target/ddk.target +++ b/ddk-target/ddk.target @@ -1,6 +1,6 @@ - + @@ -45,20 +45,24 @@ - - - - - - - - - + + + + + + + + + + + + + - - - + + +