Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we change from import package too require bundle in all the plugins?

Copy link
Copy Markdown
Collaborator Author

@KrisLimbo KrisLimbo Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was encountering Eclipse startup issues when trying to deploy the DDK features (i.e. export DDK plugin on host and reboot) on an ASMD workspace. [Debug log here:] (https://github.com/user-attachments/files/26257056/Debug_Log.txt)
Similar to apache/logging-log4j2#2655
It seems that ProviderUtil.lazyInit was locking up because it could not find a list of providers, so I decided
to change to require bundles to make sure that log4j.core gets loaded first before log4j.api.

But maybe there's a better way to do this?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that locking up of ProviderUtil.lazyInit was caused in the ASMD workspace, when the require-bundle log4j.api gets loaded first before log4j.core.
I removed all require-bundle entries referring to logging.log4j in the ASMD target and moved them all to import-package section. Looks like the trouble with the startup issues disappeared.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

org.eclipse.jdt.internal.ui.text,
org.apache.log4j
Import-Package: org.eclipse.jdt.internal.ui.text,
org.apache.logging.log4j
Automatic-Module-Name: com.avaloq.tools.ddk.check.core
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
* <p>Infers a JVM model from the source model.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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, '_'), '_');
}
}
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.check.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions com.avaloq.tools.ddk.check.ui.test/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.checkcfg.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.sample.helloworld/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions com.avaloq.tools.ddk.test.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ 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,
com.avaloq.tools.ddk.test.ui.junit.runners,
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
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.builder/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.xtext.export.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.xtext.expression/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.format/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.xtext.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Loading