TT

amitjoy · Dec 15, 2023 · 9ac1c8c · 9ac1c8c
1 parent 01c0913
commit 9ac1c8c
Show file tree

Hide file tree

Showing 34 changed files with 68 additions and 87 deletions.
diff --git a/cnf/ext/runtime.bnd b/cnf/ext/runtime.bnd
@@ -12,7 +12,7 @@ bundles.console: \
                  org.eclipse.equinox.console
 
 bundles.deps: \
-                 javax.annotation,\
+                 jakarta.annotation-api,\
                  jakarta.inject.jakarta.inject-api,\
                  javax.xml.jre,\
                  org.apache.commons.jxpath,\

diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven
@@ -63,10 +63,13 @@ org.eclipse.platform:org.eclipse.e4.core.di.extensions.supplier:0.17.300
 org.eclipse.platform:org.eclipse.e4.core.services:2.4.200
 org.eclipse.platform:org.eclipse.e4.emf.xpath:0.4.100
 org.eclipse.platform:org.eclipse.e4.ui.di:1.5.200
-org.eclipse.platform:org.eclipse.e4.ui.model.workbench:2.4.100
 org.eclipse.platform:org.eclipse.e4.ui.services:1.6.200
 org.eclipse.platform:org.eclipse.e4.ui.workbench:1.15.200
 
+# The following cannot be used as it uses jakarta.* annotations which cannot be parsed by e(fx)clipse now
+# org.eclipse.platform:org.eclipse.e4.ui.model.workbench:2.4.100
+
+
 # Eclipse Platform
 
 org.eclipse.platform:org.eclipse.core.commands:3.11.200
@@ -91,4 +94,5 @@ org.apache.sling:org.apache.sling.commons.logservice:1.1.0
 
 # Jakarta
 
-jakarta.inject:jakarta.inject-api:2.0.1
+jakarta.inject:jakarta.inject-api:2.0.1
+jakarta.annotation:jakarta.annotation-api:2.1.1
diff --git a/...onsole.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java b/...onsole.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java
@@ -22,9 +22,6 @@
 import java.time.Duration;
 import java.util.concurrent.ScheduledFuture;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -37,6 +34,8 @@
 import com.osgifx.console.executor.Executor;
 import com.osgifx.console.supervisor.Supervisor;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import jakarta.inject.Inject;
 
 public final class AgentPingAddon {

diff --git a/...plication/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java b/...plication/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java
@@ -18,14 +18,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.fx.core.log.FluentLogger;
 import org.eclipse.fx.core.log.Log;
 
 import com.google.common.collect.Maps;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 
 public final class ModifiablePropertyAddon {

diff --git a/...src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java b/...src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java
@@ -18,8 +18,6 @@
 import java.util.List;
 import java.util.stream.IntStream;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.fx.core.log.FluentLogger;
@@ -34,6 +32,7 @@
 import com.osgifx.console.application.dialog.MqttConnectionSettingDTO;
 import com.osgifx.console.application.preference.ConnectionsProvider;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 

diff --git a/...c/main/java/com/osgifx/console/application/handler/SocketConnectionPreferenceHandler.java b/...c/main/java/com/osgifx/console/application/handler/SocketConnectionPreferenceHandler.java
@@ -18,8 +18,6 @@
 import java.util.List;
 import java.util.stream.IntStream;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.fx.core.log.FluentLogger;
@@ -34,6 +32,7 @@
 import com.osgifx.console.application.dialog.SocketConnectionSettingDTO;
 import com.osgifx.console.application.preference.ConnectionsProvider;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 

diff --git a/com.osgifx.console.bnd.dp.packager/bnd.bnd b/com.osgifx.console.bnd.dp.packager/bnd.bnd
@@ -9,6 +9,6 @@
 Import-Package      : \
                       com.google.errorprone.annotations;'resolution:'=optional,\
                       com.google.errorprone.annotations.concurrent;'resolution:'=optional,\
-                      javax.annotation;'resolution:'=optional,\
+                      jakarta.annotation;'resolution:'=optional,\
                       org.checkerframework.checker.nullness.qual;'resolution:'=optional,\
                       *
diff --git a/...extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxUI.java b/...extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxUI.java
@@ -21,8 +21,6 @@
 
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.e4.ui.di.Focus;
@@ -39,6 +37,7 @@
 import com.osgifx.console.util.agent.ExtensionHelper;
 import com.osgifx.console.util.fx.Fx;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/com.osgifx.console.product/osgifx.bndrun b/com.osgifx.console.product/osgifx.bndrun
@@ -30,6 +30,9 @@ startlevels                       :   com.osgifx.console.agent;startlevel=1,\
 -runproperties.name               :   launch.name=OSGi.fx
 -runproperties.logging            :   org.apache.sling.commons.log.file=${storage.directory}/logs/fx.log,\
                                       org.apache.sling.commons.log.pattern="{0,date,yyyy-MM-dd  HH:mm:ss.SSSXXX}     {4}     [{2}]  [{3}]  {5}"
+# Annotation classes from the 'javax.inject' or 'javax.annotation' package found in the binaries as they
+# are used in e(fx)clipse internally. OSGi.fx doesn't use javax.* at all though.
+-runproperties.javax.warning      :   eclipse.e4.inject.javax.warning=false
 
 # the following configuration is used to ensure that MQTT client will not be automatically enabled
 -runproperties.mqtt.init.config   :   configurator.initial='{\
@@ -129,6 +132,8 @@ install.order                     :   \
 	com.osgifx.console.wrapper.toolboxfx;version=snapshot;startlevel=10,\
 	controlsfx;version='[11.1.3,11.1.4)';startlevel=10,\
 	in.bytehue.messaging.mqtt5.provider;version='[1.0.0,1.0.1)';startlevel=10,\
+	jakarta.annotation-api;version='[2.1.1,2.1.2)';startlevel=10,\
+	jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)';startlevel=10,\
 	jakarta.xml.bind;version='[2.3.3,2.3.4)';startlevel=10,\
 	javax.activation;version='[1.2.2,1.2.3)';startlevel=10,\
 	javax.annotation;version='[1.3.5,1.3.6)';startlevel=10,\
@@ -153,35 +158,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.100,3.11.101)';startlevel=10,\
-	org.eclipse.core.contenttype;version='[3.9.100,3.9.101)';startlevel=10,\
+	org.eclipse.core.commands;version='[3.11.200,3.11.201)';startlevel=10,\
+	org.eclipse.core.contenttype;version='[3.9.200,3.9.201)';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.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.100,0.17.101)';startlevel=10,\
-	org.eclipse.e4.core.services;version='[2.4.100,2.4.101)';startlevel=10,\
+	org.eclipse.core.jobs;version='[3.15.100,3.15.101)';startlevel=10,\
+	org.eclipse.core.runtime;version='[3.30.0,3.30.1)';startlevel=10,\
+	org.eclipse.e4.core.commands;version='[1.1.200,1.1.201)';startlevel=10,\
+	org.eclipse.e4.core.contexts;version='[1.12.400,1.12.401)';startlevel=10,\
+	org.eclipse.e4.core.di;version='[1.9.200,1.9.201)';startlevel=10,\
+	org.eclipse.e4.core.di.annotations;version='[1.8.200,1.8.201)';startlevel=10,\
+	org.eclipse.e4.core.di.extensions;version='[0.18.100,0.18.101)';startlevel=10,\
+	org.eclipse.e4.core.di.extensions.supplier;version='[0.17.300,0.17.301)';startlevel=10,\
+	org.eclipse.e4.core.services;version='[2.4.200,2.4.201)';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.di;version='[1.5.200,1.5.201)';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.e4.ui.services;version='[1.6.200,1.6.201)';startlevel=10,\
+	org.eclipse.e4.ui.workbench;version='[1.15.200,1.15.201)';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.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.300,3.10.301)';startlevel=10,\
-	org.eclipse.equinox.registry;version='[3.11.300,3.11.301)';startlevel=10,\
+	org.eclipse.equinox.app;version='[1.6.400,1.6.401)';startlevel=10,\
+	org.eclipse.equinox.common;version='[3.18.200,3.18.201)';startlevel=10,\
+	org.eclipse.equinox.console;version='[1.4.600,1.4.601)';startlevel=10,\
+	org.eclipse.equinox.event;version='[1.6.300,1.6.301)';startlevel=10,\
+	org.eclipse.equinox.preferences;version='[3.10.400,3.10.401)';startlevel=10,\
+	org.eclipse.equinox.registry;version='[3.11.400,3.11.401)';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,\
@@ -205,7 +210,7 @@ install.order                     :   \
 	org.eclipse.fx.ui.workbench.renderers.fx;version='[3.9.0,3.9.1)';startlevel=10,\
 	org.eclipse.fx.ui.workbench.services;version='[3.9.0,3.9.1)';startlevel=10,\
 	org.eclipse.jdt.annotation;version='[2.2.700,2.2.701)';startlevel=10,\
-	org.eclipse.osgi.services;version='[3.11.100,3.11.101)';startlevel=10,\
+	org.eclipse.osgi.services;version='[3.11.200,3.11.201)';startlevel=10,\
 	org.glassfish.jakarta.json;version='[2.0.1,2.0.2)';startlevel=10,\
 	org.osgi.service.cm;version='[1.6.1,1.6.2)';startlevel=10,\
 	org.osgi.service.component;version='[1.5.1,1.5.2)';startlevel=10,\

diff --git a/...onsole.templates/resources/templates/ui/$srcDir$/$basePackageDir$/SampleFxController.java b/...onsole.templates/resources/templates/ui/$srcDir$/$basePackageDir$/SampleFxController.java
@@ -1,6 +1,6 @@
 package $basePackageName$;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.fx.core.log.FluentLogger;
 import org.eclipse.fx.core.log.Log;

diff --git a/...osgifx.console.templates/resources/templates/ui/$srcDir$/$basePackageDir$/SampleFxUI.java b/...osgifx.console.templates/resources/templates/ui/$srcDir$/$basePackageDir$/SampleFxUI.java
@@ -5,9 +5,9 @@
 
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;

diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxUI.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxUI.java
@@ -21,8 +21,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 import static javafx.geometry.Orientation.VERTICAL;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -41,6 +39,7 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/....console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxUI.java b/....console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxUI.java
@@ -21,8 +21,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 import static javafx.geometry.Orientation.VERTICAL;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -41,6 +39,7 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/...configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxUI.java b/...configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxUI.java
@@ -21,8 +21,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 import static javafx.geometry.Orientation.VERTICAL;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -41,6 +39,7 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxUI.java b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxUI.java
@@ -20,8 +20,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.fx.core.log.FluentLogger;
@@ -36,6 +34,7 @@
 import com.osgifx.console.ui.ConsoleStatusBar;
 import com.osgifx.console.util.fx.Fx;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxUI.java b/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxUI.java
@@ -19,8 +19,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.fx.core.log.FluentLogger;
@@ -35,6 +33,7 @@
 import com.osgifx.console.ui.ConsoleStatusBar;
 import com.osgifx.console.util.fx.Fx;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxUI.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxUI.java
@@ -21,8 +21,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -39,6 +37,7 @@
 import com.osgifx.console.ui.events.dialog.SubscribedEventsDialog;
 import com.osgifx.console.util.fx.Fx;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxUI.java b/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxUI.java
@@ -19,8 +19,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.e4.ui.di.UIEventTopic;
@@ -34,6 +32,7 @@
 import com.osgifx.console.ui.ConsoleStatusBar;
 import com.osgifx.console.util.fx.Fx;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import javafx.concurrent.Task;
 import javafx.fxml.FXMLLoader;

diff --git a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxUI.java b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxUI.java
@@ -18,8 +18,6 @@
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC;
 
-import javax.annotation.PostConstruct;
-
 import org.apache.commons.lang3.EnumUtils;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
@@ -43,6 +41,7 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javafx.concurrent.Task;

diff --git a/...osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeBundleGraph.java b/...osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeBundleGraph.java
@@ -25,8 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
-
 import org.eclipse.e4.core.di.annotations.Creatable;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.EventTopic;
@@ -41,6 +39,7 @@
 import com.osgifx.console.agent.dto.XBundleInfoDTO;
 import com.osgifx.console.data.provider.DataProvider;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 
 @Creatable