From bbbc82589c082f890d61d301db2d7c548cbb8c0e Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Tue, 31 Oct 2023 10:41:16 +0100 Subject: [PATCH 01/10] Formatted DI Implementation --- .../src/main/java/com/osgifx/console/agent/di/DI.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/com.osgifx.console.agent.di/src/main/java/com/osgifx/console/agent/di/DI.java b/com.osgifx.console.agent.di/src/main/java/com/osgifx/console/agent/di/DI.java index 19352e4b..891e1ddb 100644 --- a/com.osgifx.console.agent.di/src/main/java/com/osgifx/console/agent/di/DI.java +++ b/com.osgifx.console.agent.di/src/main/java/com/osgifx/console/agent/di/DI.java @@ -147,11 +147,9 @@ private T getInstance(final Class requestedType, final Class parent) { } return (T) instanceFromProvider; } - return (T) createNewInstance(type, parent); } catch (final DiException rootCause) { final StringBuilder errorMessage = new StringBuilder("DI wasn't able to create your class hierarchy. "); - if (parent != null) { errorMessage.append("\nCannot instantiate the class [").append(parent.getName()).append("]. ") .append("At least one of the constructor parameters of type [").append(requestedType) @@ -186,7 +184,6 @@ private T createNewInstance(final Class type, final Class parent) { if (isSingleton(type)) { singletonInstances.put(type, newInstance); } - return newInstance; } catch (final Exception e) { throw new DiException(createErrorMessageStart(type) + "An Exception was thrown during the instantiation.", @@ -376,11 +373,9 @@ private T getInstanceFromProvider(final Class type) { @SuppressWarnings("unchecked") private Constructor findConstructor(final Class type) { final Constructor[] constructors = type.getConstructors(); - if (constructors.length == 0) { throw new DiException(createErrorMessageStart(type) + "The class has no public constructor."); } - if (constructors.length <= 1) { return (Constructor) constructors[0]; } @@ -400,7 +395,6 @@ private Constructor findConstructor(final Class type) { + "Fix this by either make only one constructor public " + "or annotate exactly one constructor with the javax.inject.Inject annotation."); } - // we are not modifying the constructor array so we can safely cast here. return (Constructor) constructorsWithInject.get(0); } From 6d1c54831ef5bf6486d60d1a99e89ab0ad929857 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Wed, 1 Nov 2023 10:42:20 +0100 Subject: [PATCH 02/10] Removed unnecessary Table class --- .../com/osgifx/console/util/fx/Table.java | 117 ------------------ 1 file changed, 117 deletions(-) delete mode 100644 com.osgifx.console.util/src/main/java/com/osgifx/console/util/fx/Table.java diff --git a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/fx/Table.java b/com.osgifx.console.util/src/main/java/com/osgifx/console/util/fx/Table.java deleted file mode 100644 index 47b89e29..00000000 --- a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/fx/Table.java +++ /dev/null @@ -1,117 +0,0 @@ -/******************************************************************************* - * Copyright 2021-2023 Amit Kumar Mondal - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - ******************************************************************************/ -package com.osgifx.console.util.fx; - -import static com.google.common.base.Verify.verify; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import com.google.common.collect.Lists; - -public final class Table { - - private static final String HORIZONTAL_SEP = "-"; - - private String joinSep; - private String[] headers; - private String verticalSep; - private boolean rightAlign; - - private final List rows; - - public Table() { - rows = Lists.newArrayList(); - setShowVerticalLines(false); - } - - public void setRightAlign(final boolean rightAlign) { - this.rightAlign = rightAlign; - } - - public void setShowVerticalLines(final boolean showVerticalLines) { - joinSep = showVerticalLines ? "+" : " "; - verticalSep = showVerticalLines ? "|" : ""; - } - - public void setHeaders(final String... headers) { - this.headers = headers; - } - - public void addRow(final String... cells) { - rows.add(cells); - } - - public String print() { - var maxWidths = headers != null ? Arrays.stream(headers).mapToInt(String::length).toArray() : null; - - for (final String[] cells : rows) { - if (maxWidths == null) { - maxWidths = new int[cells.length]; - } - verify(cells.length == maxWidths.length, "Number of row-cells and headers should be consistent"); - for (var i = 0; i < cells.length; i++) { - maxWidths[i] = Math.max(maxWidths[i], cells[i].length()); - } - } - - final var b = new StringBuilder(); - if (headers != null) { - final var b1 = printLine(maxWidths); - final var b2 = printRow(headers, maxWidths); - final var b3 = printLine(maxWidths); - - b.append(b1).append(b2).append(b3); - } - for (final String[] cells : rows) { - final var b4 = printRow(cells, maxWidths); - b.append(b4); - } - if (headers != null && maxWidths != null) { - final var b5 = printLine(maxWidths); - b.append(b5); - } - return b.toString(); - } - - private StringBuilder printLine(final int[] columnWidths) { - final var builder = new StringBuilder(); - for (var i = 0; i < columnWidths.length; i++) { - final var line = String.join("", - Collections.nCopies(columnWidths[i] + verticalSep.length() + 1, HORIZONTAL_SEP)); - builder.append(joinSep + line + (i == columnWidths.length - 1 ? joinSep : "")); - } - builder.append(System.lineSeparator()); - return builder; - } - - private StringBuilder printRow(final String[] cells, final int[] maxWidths) { - final var builder = new StringBuilder(); - for (var i = 0; i < cells.length; i++) { - final var s = cells[i]; - final var verStrTemp = i == cells.length - 1 ? verticalSep : ""; - if (rightAlign) { - builder.append(String.format("%s %" + maxWidths[i] + "s %s", verticalSep, s, verStrTemp)); - } else { - builder.append(String.format("%s %-" + maxWidths[i] + "s %s", verticalSep, s, verStrTemp)); - } - } - builder.append(System.lineSeparator()); - return builder; - } - -} From cf58d62d5f5322e596381016e7eac1d7407c1568 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Thu, 2 Nov 2023 10:45:32 +0100 Subject: [PATCH 03/10] Refactored Config Helpers --- .../util/configuration/ConfigHelper.java | 18 ++++++++++-------- .../configuration/FactoryConfigHelper.java | 6 ++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/ConfigHelper.java b/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/ConfigHelper.java index ecbf6861..d61e268c 100644 --- a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/ConfigHelper.java +++ b/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/ConfigHelper.java @@ -21,9 +21,11 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Collections; -import java.util.Hashtable; +import java.util.HashMap; import java.util.Map; +import org.eclipse.fx.core.ExceptionUtils; +import org.osgi.framework.FrameworkUtil; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; @@ -41,10 +43,10 @@ */ public class ConfigHelper { - final T delegate; - final Class type; - final Hashtable properties = new Hashtable<>(); - final ConfigurationAdmin cm; + final T delegate; + final Class type; + final ConfigurationAdmin cm; + final Map properties = new HashMap<>(); Method lastInvocation; String pid; @@ -116,7 +118,7 @@ public ConfigHelper set(final X older, final X newer) { try { value = Converter.cnv(lastInvocation.getGenericReturnType(), newer); } catch (final Exception e) { - throw new RuntimeException(e); + throw ExceptionUtils.wrap(e); } if (value instanceof Enum) { value = ((Enum) value).name(); @@ -151,7 +153,7 @@ public Map read(final String pid) { try { configuration = cm.getConfiguration(pid, "?"); } catch (final IOException e) { - throw new RuntimeException(e); + throw ExceptionUtils.wrap(e); } final var dict = configuration.getProperties(); if (dict != null) { @@ -173,7 +175,7 @@ public void update() { Configuration configuration; try { configuration = cm.getConfiguration(pid, "?"); - configuration.update(properties); + configuration.update(FrameworkUtil.asDictionary(properties)); } catch (final IOException e) { // highly unlikely to occur } diff --git a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/FactoryConfigHelper.java b/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/FactoryConfigHelper.java index 15b34c34..5a66487e 100644 --- a/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/FactoryConfigHelper.java +++ b/com.osgifx.console.util/src/main/java/com/osgifx/console/util/configuration/FactoryConfigHelper.java @@ -22,6 +22,8 @@ import java.util.Set; import java.util.stream.Stream; +import org.eclipse.fx.core.ExceptionUtils; +import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; @@ -57,9 +59,9 @@ public FactoryConfigHelper create() { try { configuration = cm.createFactoryConfiguration(factoryPid, "?"); pid = configuration.getPid(); - configuration.update(properties); + configuration.update(FrameworkUtil.asDictionary(properties)); } catch (final IOException e) { - throw new RuntimeException(e); + throw ExceptionUtils.wrap(e); } return this; } From c1ce7319ff5d73debc1b4f12d5e40b2a592a4dc7 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Fri, 3 Nov 2023 10:51:48 +0100 Subject: [PATCH 04/10] Updated Bnd Bundles closes #680 --- cnf/maven/build.maven | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cnf/maven/build.maven b/cnf/maven/build.maven index d03aa31c..6cbfba6e 100644 --- a/cnf/maven/build.maven +++ b/cnf/maven/build.maven @@ -4,12 +4,12 @@ com.google.mug:mug:6.6 # bnd -biz.aQute.bnd:biz.aQute.bndlib:6.4.1 -biz.aQute.bnd:biz.aQute.resolve:6.4.1 -biz.aQute.bnd:biz.aQute.remote.agent:6.4.1 -biz.aQute.bnd:biz.aQute.launchpad:6.4.1 -biz.aQute.bnd:biz.aQute.remote.agent:6.4.1 -biz.aQute.bnd:biz.aQute.bnd.util:6.4.1 +biz.aQute.bnd:biz.aQute.bndlib:7.0.0 +biz.aQute.bnd:biz.aQute.resolve:7.0.0 +biz.aQute.bnd:biz.aQute.remote.agent:7.0.0 +biz.aQute.bnd:biz.aQute.launchpad:7.0.0 +biz.aQute.bnd:biz.aQute.remote.agent:7.0.0 +biz.aQute.bnd:biz.aQute.bnd.util:7.0.0 # Apache From 374a118a4fdd3981c984f5e267de5719697de18c Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Sat, 4 Nov 2023 10:54:26 +0100 Subject: [PATCH 05/10] Updated Commons IO closes #681 --- cnf/maven/runtime.maven | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven index 2de8fcf8..d9e328c1 100644 --- a/cnf/maven/runtime.maven +++ b/cnf/maven/runtime.maven @@ -4,7 +4,7 @@ com.google.code.gson:gson:2.10.1 # Apache -commons-io:commons-io:2.13.0 +commons-io:commons-io:2.14.0 org.apache.aries.component-dsl:org.apache.aries.component-dsl.component-dsl:1.2.2 org.apache.commons:commons-lang3:3.13.0 org.apache.commons:commons-text:1.10.0 From e66dc59db6bec6af9fa888511323605a05f24e6b Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Sun, 5 Nov 2023 10:56:01 +0100 Subject: [PATCH 06/10] Updated ToolboxFX closes #682 --- cnf/maven/build.maven | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/maven/build.maven b/cnf/maven/build.maven index 6cbfba6e..77540ace 100644 --- a/cnf/maven/build.maven +++ b/cnf/maven/build.maven @@ -58,7 +58,7 @@ org.osgi:org.osgi.util.converter:1.0.9 eu.hansolo:tilesfx:17.1.31 eu.hansolo:toolbox:17.0.57 -eu.hansolo:toolboxfx:17.0.47 +eu.hansolo:toolboxfx:17.0.49 # FormsFx From 7961ff419df2b49c5f84f1dfa9c2f0f2012d2da1 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Mon, 6 Nov 2023 10:57:35 +0100 Subject: [PATCH 07/10] Updated Commons Text closes #683 --- cnf/maven/runtime.maven | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven index d9e328c1..3f6a998e 100644 --- a/cnf/maven/runtime.maven +++ b/cnf/maven/runtime.maven @@ -7,7 +7,7 @@ com.google.code.gson:gson:2.10.1 commons-io:commons-io:2.14.0 org.apache.aries.component-dsl:org.apache.aries.component-dsl.component-dsl:1.2.2 org.apache.commons:commons-lang3:3.13.0 -org.apache.commons:commons-text:1.10.0 +org.apache.commons:commons-text:1.11.0 # JSON From b353249f97d53ca1eb62bbfb3a0fa6fc743e64b9 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Tue, 7 Nov 2023 11:02:05 +0100 Subject: [PATCH 08/10] Updated Commons IO --- cnf/maven/runtime.maven | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven index 3f6a998e..c3dcaefe 100644 --- a/cnf/maven/runtime.maven +++ b/cnf/maven/runtime.maven @@ -4,7 +4,7 @@ com.google.code.gson:gson:2.10.1 # Apache -commons-io:commons-io:2.14.0 +commons-io:commons-io:2.15.0 org.apache.aries.component-dsl:org.apache.aries.component-dsl.component-dsl:1.2.2 org.apache.commons:commons-lang3:3.13.0 org.apache.commons:commons-text:1.11.0 From f63fe21edee29e0d69617eaca34ca1342c5eb8d4 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Wed, 8 Nov 2023 11:11:32 +0100 Subject: [PATCH 09/10] Updated Commons Text BSN --- cnf/ext/runtime.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/ext/runtime.bnd b/cnf/ext/runtime.bnd index bb531647..0608ece3 100644 --- a/cnf/ext/runtime.bnd +++ b/cnf/ext/runtime.bnd @@ -83,7 +83,7 @@ bundles.required: \ org.apache.aries.component-dsl.component-dsl,\ org.apache.commons.lang3,\ org.apache.commons.commons-io,\ - org.apache.commons.commons-text,\ + org.apache.commons.text,\ org.eclipse.equinox.preferences,\ controlsfx,\ javax.inject,\ From f386c8b9e7bbe67afc3f326b58f2d49a1d65d627 Mon Sep 17 00:00:00 2001 From: Amit Kumar Mondal Date: Thu, 9 Nov 2023 11:12:02 +0100 Subject: [PATCH 10/10] Updated Eclipse to 2023.09 closes #684 --- cnf/maven/runtime.maven | 62 ++++++++++++------------ com.osgifx.console.product/osgifx.bndrun | 46 +++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven index c3dcaefe..19f9c1a9 100644 --- a/cnf/maven/runtime.maven +++ b/cnf/maven/runtime.maven @@ -35,53 +35,53 @@ org.osgi:org.osgi.service.component:1.5.1 # Equinox -org.eclipse.platform:org.eclipse.equinox.app:1.6.200 -org.eclipse.platform:org.eclipse.equinox.bidi:1.4.200 -org.eclipse.platform:org.eclipse.equinox.common:3.18.0 +org.eclipse.platform:org.eclipse.equinox.app:1.6.300 +org.eclipse.platform:org.eclipse.equinox.bidi:1.4.300 +org.eclipse.platform:org.eclipse.equinox.common:3.18.100 org.eclipse.platform:org.eclipse.equinox.concurrent:1.2.100 org.eclipse.platform:org.eclipse.equinox.console:1.4.500 org.eclipse.platform:org.eclipse.equinox.ds:1.6.200 org.eclipse.platform:org.eclipse.equinox.event:1.6.200 -org.eclipse.platform:org.eclipse.equinox.launcher:1.6.400 +org.eclipse.platform:org.eclipse.equinox.launcher:1.6.500 org.eclipse.platform:org.eclipse.equinox.launcher.cocoa.macosx:1.2.700 org.eclipse.platform:org.eclipse.equinox.launcher.cocoa.macosx.x86_64:1.2.700 org.eclipse.platform:org.eclipse.equinox.launcher.gtk.linux.x86_64:1.2.700 org.eclipse.platform:org.eclipse.equinox.launcher.win32.win32.x86_64:1.2.700 -org.eclipse.platform:org.eclipse.equinox.preferences:3.10.200 -org.eclipse.platform:org.eclipse.equinox.registry:3.11.200 -org.eclipse.platform:org.eclipse.osgi:3.18.400 +org.eclipse.platform:org.eclipse.equinox.preferences:3.10.300 +org.eclipse.platform:org.eclipse.equinox.registry:3.11.300 +org.eclipse.platform:org.eclipse.osgi:3.18.500 org.eclipse.platform:org.eclipse.osgi.services:3.11.100 # Eclipse e4 -org.eclipse.platform:org.eclipse.e4.core.commands:1.1.0 -org.eclipse.platform:org.eclipse.e4.core.contexts:1.12.0 -org.eclipse.platform:org.eclipse.e4.core.di:1.9.0 -org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.8.0 +org.eclipse.platform:org.eclipse.e4.core.commands:1.1.100 +org.eclipse.platform:org.eclipse.e4.core.contexts:1.12.100 +org.eclipse.platform:org.eclipse.e4.core.di:1.9.100 +org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.8.100 org.eclipse.platform:org.eclipse.e4.core.di.extensions:0.18.0 -org.eclipse.platform:org.eclipse.e4.core.di.extensions.supplier:0.17.0 -org.eclipse.platform:org.eclipse.e4.core.services:2.4.0 -org.eclipse.platform:org.eclipse.e4.emf.xpath:0.4.0 -org.eclipse.platform:org.eclipse.e4.ui.di:1.5.0 -org.eclipse.platform:org.eclipse.e4.ui.model.workbench:2.4.0 -org.eclipse.platform:org.eclipse.e4.ui.services:1.6.0 -org.eclipse.platform:org.eclipse.e4.ui.workbench:1.15.0 +org.eclipse.platform:org.eclipse.e4.core.di.extensions.supplier:0.17.100 +org.eclipse.platform:org.eclipse.e4.core.services:2.4.100 +org.eclipse.platform:org.eclipse.e4.emf.xpath:0.4.100 +org.eclipse.platform:org.eclipse.e4.ui.di:1.5.100 +org.eclipse.platform:org.eclipse.e4.ui.model.workbench:2.4.100 +org.eclipse.platform:org.eclipse.e4.ui.services:1.6.100 +org.eclipse.platform:org.eclipse.e4.ui.workbench:1.15.100 # Eclipse Platform -org.eclipse.platform:org.eclipse.core.commands:3.11.0 -org.eclipse.platform:org.eclipse.core.contenttype:3.9.0 -org.eclipse.platform:org.eclipse.core.databinding:1.13.0 -org.eclipse.platform:org.eclipse.core.databinding.beans:1.10.0 -org.eclipse.platform:org.eclipse.core.databinding.observable:1.13.0 -org.eclipse.platform:org.eclipse.core.databinding.property:1.10.0 -org.eclipse.platform:org.eclipse.core.filebuffers:3.8.0 -org.eclipse.platform:org.eclipse.core.filesystem:1.10.0 -org.eclipse.platform:org.eclipse.core.jobs:3.14.0 -org.eclipse.platform:org.eclipse.core.net:1.5.0 -org.eclipse.platform:org.eclipse.core.resources:3.19.0 -org.eclipse.platform:org.eclipse.core.runtime:3.27.0 -org.eclipse.platform:org.eclipse.core.variables:3.6.0 +org.eclipse.platform:org.eclipse.core.commands:3.11.100 +org.eclipse.platform:org.eclipse.core.contenttype:3.9.100 +org.eclipse.platform:org.eclipse.core.databinding:1.13.100 +org.eclipse.platform:org.eclipse.core.databinding.beans:1.10.100 +org.eclipse.platform:org.eclipse.core.databinding.observable:1.13.100 +org.eclipse.platform:org.eclipse.core.databinding.property:1.10.100 +org.eclipse.platform:org.eclipse.core.filebuffers:3.8.100 +org.eclipse.platform:org.eclipse.core.filesystem:1.10.100 +org.eclipse.platform:org.eclipse.core.jobs:3.15.0 +org.eclipse.platform:org.eclipse.core.net:1.5.100 +org.eclipse.platform:org.eclipse.core.resources:3.19.100 +org.eclipse.platform:org.eclipse.core.runtime:3.29.0 +org.eclipse.platform:org.eclipse.core.variables:3.6.100 # OSGi Logging diff --git a/com.osgifx.console.product/osgifx.bndrun b/com.osgifx.console.product/osgifx.bndrun index 2b19cc89..3769473a 100644 --- a/com.osgifx.console.product/osgifx.bndrun +++ b/com.osgifx.console.product/osgifx.bndrun @@ -135,11 +135,11 @@ install.order : \ javax.inject;version='[1.0.0,1.0.1)';startlevel=10,\ javax.xml.jre;version='[1.3.4,1.3.5)';startlevel=10,\ org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)';startlevel=10,\ - org.apache.commons.commons-io;version='[2.13.0,2.13.1)';startlevel=10,\ - org.apache.commons.commons-text;version='[1.10.0,1.10.1)';startlevel=10,\ + org.apache.commons.commons-io;version='[2.15.0,2.15.1)';startlevel=10,\ org.apache.commons.jxpath;version='[1.3.0,1.3.1)';startlevel=10,\ org.apache.commons.lang;version='[2.6.0,2.6.1)';startlevel=10,\ org.apache.commons.lang3;version='[3.13.0,3.13.1)';startlevel=10,\ + org.apache.commons.text;version='[1.11.0,1.11.1)';startlevel=10,\ org.apache.felix.cm.json;version='[2.0.0,2.0.1)';startlevel=10,\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)';startlevel=10,\ org.apache.felix.configurator;version='[1.0.18,1.0.19)';startlevel=10,\ @@ -153,35 +153,35 @@ install.order : \ org.apache.felix.scr;version='[2.2.6,2.2.7)';startlevel=10,\ org.apache.sling.commons.log;version='[5.4.2,5.4.3)';startlevel=10,\ org.apache.sling.commons.logservice;version='[1.1.0,1.1.1)';startlevel=10,\ - org.eclipse.core.commands;version='[3.11.0,3.11.1)';startlevel=10,\ - org.eclipse.core.contenttype;version='[3.9.0,3.9.1)';startlevel=10,\ - org.eclipse.core.databinding.observable;version='[1.13.0,1.13.1)';startlevel=10,\ - org.eclipse.core.databinding.property;version='[1.10.0,1.10.1)';startlevel=10,\ + org.eclipse.core.commands;version='[3.11.100,3.11.101)';startlevel=10,\ + org.eclipse.core.contenttype;version='[3.9.100,3.9.101)';startlevel=10,\ + org.eclipse.core.databinding.observable;version='[1.13.100,1.13.101)';startlevel=10,\ + org.eclipse.core.databinding.property;version='[1.10.100,1.10.101)';startlevel=10,\ org.eclipse.core.expressions;version='[3.8.200,3.8.201)';startlevel=10,\ - org.eclipse.core.jobs;version='[3.14.0,3.14.1)';startlevel=10,\ - org.eclipse.core.runtime;version='[3.27.0,3.27.1)';startlevel=10,\ - org.eclipse.e4.core.commands;version='[1.1.0,1.1.1)';startlevel=10,\ - org.eclipse.e4.core.contexts;version='[1.12.0,1.12.1)';startlevel=10,\ - org.eclipse.e4.core.di;version='[1.9.0,1.9.1)';startlevel=10,\ - org.eclipse.e4.core.di.annotations;version='[1.8.0,1.8.1)';startlevel=10,\ + org.eclipse.core.jobs;version='[3.15.0,3.15.1)';startlevel=10,\ + org.eclipse.core.runtime;version='[3.29.0,3.29.1)';startlevel=10,\ + org.eclipse.e4.core.commands;version='[1.1.100,1.1.101)';startlevel=10,\ + org.eclipse.e4.core.contexts;version='[1.12.100,1.12.101)';startlevel=10,\ + org.eclipse.e4.core.di;version='[1.9.100,1.9.101)';startlevel=10,\ + org.eclipse.e4.core.di.annotations;version='[1.8.100,1.8.101)';startlevel=10,\ org.eclipse.e4.core.di.extensions;version='[0.18.0,0.18.1)';startlevel=10,\ - org.eclipse.e4.core.di.extensions.supplier;version='[0.17.0,0.17.1)';startlevel=10,\ - org.eclipse.e4.core.services;version='[2.4.0,2.4.1)';startlevel=10,\ - org.eclipse.e4.emf.xpath;version='[0.4.0,0.4.1)';startlevel=10,\ - org.eclipse.e4.ui.di;version='[1.5.0,1.5.1)';startlevel=10,\ - org.eclipse.e4.ui.model.workbench;version='[2.4.0,2.4.1)';startlevel=10,\ - org.eclipse.e4.ui.services;version='[1.6.0,1.6.1)';startlevel=10,\ - org.eclipse.e4.ui.workbench;version='[1.15.0,1.15.1)';startlevel=10,\ + org.eclipse.e4.core.di.extensions.supplier;version='[0.17.100,0.17.101)';startlevel=10,\ + org.eclipse.e4.core.services;version='[2.4.100,2.4.101)';startlevel=10,\ + org.eclipse.e4.emf.xpath;version='[0.3.0,0.3.1)';startlevel=10,\ + org.eclipse.e4.ui.di;version='[1.5.100,1.5.101)';startlevel=10,\ + org.eclipse.e4.ui.model.workbench;version='[2.2.200,2.2.201)';startlevel=10,\ + org.eclipse.e4.ui.services;version='[1.6.100,1.6.101)';startlevel=10,\ + org.eclipse.e4.ui.workbench;version='[1.15.100,1.15.101)';startlevel=10,\ org.eclipse.emf.common;version='[2.26.0,2.26.1)';startlevel=10,\ org.eclipse.emf.ecore;version='[2.28.0,2.28.1)';startlevel=10,\ org.eclipse.emf.ecore.change;version='[2.14.0,2.14.1)';startlevel=10,\ org.eclipse.emf.ecore.xmi;version='[2.17.0,2.17.1)';startlevel=10,\ - org.eclipse.equinox.app;version='[1.6.200,1.6.201)';startlevel=10,\ - org.eclipse.equinox.common;version='[3.18.0,3.18.1)';startlevel=10,\ + org.eclipse.equinox.app;version='[1.6.300,1.6.301)';startlevel=10,\ + org.eclipse.equinox.common;version='[3.18.100,3.18.101)';startlevel=10,\ org.eclipse.equinox.console;version='[1.4.500,1.4.501)';startlevel=10,\ org.eclipse.equinox.event;version='[1.6.200,1.6.201)';startlevel=10,\ - org.eclipse.equinox.preferences;version='[3.10.200,3.10.201)';startlevel=10,\ - org.eclipse.equinox.registry;version='[3.11.200,3.11.201)';startlevel=10,\ + org.eclipse.equinox.preferences;version='[3.10.300,3.10.301)';startlevel=10,\ + org.eclipse.equinox.registry;version='[3.11.300,3.11.301)';startlevel=10,\ org.eclipse.fx.core;version='[3.9.0,3.9.1)';startlevel=10,\ org.eclipse.fx.core.databinding;version='[3.9.0,3.9.1)';startlevel=10,\ org.eclipse.fx.core.di;version='[3.9.0,3.9.1)';startlevel=10,\