Merge pull request #713 from amitjoy/bugfix/711

Reverted use of jakarta.* and Eclipse 2023-12

cnf/ext/runtime.bnd

@@ -12,8 +12,8 @@ bundles.console: \
                  org.eclipse.equinox.console
 
 bundles.deps: \
-                 jakarta.annotation-api,\
-                 jakarta.inject.jakarta.inject-api,\
+                 javax.annotation,\
+                 javax.inject,\
                  javax.xml.jre,\
                  org.apache.commons.jxpath,\
                  com.google.guava,\
@@ -86,7 +86,7 @@ bundles.required: \
                  org.apache.commons.text,\
                  org.eclipse.equinox.preferences,\
                  controlsfx,\
-                 jakarta.inject.jakarta.inject-api,\
+                 javax.inject,\
                  com.osgifx.console.util,\
                  com.osgifx.console.wrapper.mug,\
                  eu.hansolo.tilesfx,\

cnf/maven/runtime.maven

@@ -35,64 +35,56 @@ org.osgi:org.osgi.service.component:1.5.1
 
 # Equinox
 
-org.eclipse.platform:org.eclipse.equinox.app:1.6.400
-org.eclipse.platform:org.eclipse.equinox.bidi:1.4.400
-org.eclipse.platform:org.eclipse.equinox.common:3.18.200
-org.eclipse.platform:org.eclipse.equinox.concurrent:1.2.200
-org.eclipse.platform:org.eclipse.equinox.console:1.4.600
+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.300
-org.eclipse.platform:org.eclipse.equinox.launcher:1.6.600
-org.eclipse.platform:org.eclipse.equinox.launcher.cocoa.macosx:1.2.800
-org.eclipse.platform:org.eclipse.equinox.launcher.cocoa.macosx.x86_64:1.2.800
-org.eclipse.platform:org.eclipse.equinox.launcher.gtk.linux.x86_64:1.2.800
-org.eclipse.platform:org.eclipse.equinox.launcher.win32.win32.x86_64:1.2.800
-org.eclipse.platform:org.eclipse.equinox.preferences:3.10.400
-org.eclipse.platform:org.eclipse.equinox.registry:3.11.400
-org.eclipse.platform:org.eclipse.osgi:3.18.600
-org.eclipse.platform:org.eclipse.osgi.services:3.11.200
+org.eclipse.platform:org.eclipse.equinox.event:1.6.200
+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.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.200
-org.eclipse.platform:org.eclipse.e4.core.contexts:1.12.400
-org.eclipse.platform:org.eclipse.e4.core.di:1.9.200
-org.eclipse.platform:org.eclipse.e4.core.di.annotations:1.8.200
-org.eclipse.platform:org.eclipse.e4.core.di.extensions:0.18.100
-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.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.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.200
-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
-
+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.200
-org.eclipse.platform:org.eclipse.core.contenttype:3.9.200
+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.200
-org.eclipse.platform:org.eclipse.core.filesystem:1.10.200
-org.eclipse.platform:org.eclipse.core.jobs:3.15.100
-org.eclipse.platform:org.eclipse.core.net:1.5.200
-org.eclipse.platform:org.eclipse.core.resources:3.20.0
-org.eclipse.platform:org.eclipse.core.runtime:3.30.0
-org.eclipse.platform:org.eclipse.core.variables:3.6.200
+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
 
 org.slf4j:slf4j-api:1.7.36
 org.apache.sling:org.apache.sling.commons.log:5.4.2
 org.apache.sling:org.apache.sling.commons.logservice:1.1.0
-
-# Jakarta
-
-jakarta.inject:jakarta.inject-api:2.0.1
-jakarta.annotation:jakarta.annotation-api:2.1.1

com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java

@@ -108,7 +108,7 @@ public List<BundleStartDuration> getBundleStartDurations() {
             return bundleToStartTime.values().stream().map(StartTime::toBundleStartDuration).collect(toList());
         }
     }
-
+    
     public Optional<BundleStartDuration> getBundleStartDuration(long bundleId) {
         return Optional.ofNullable(bundleToStartTime.get(bundleId)).map(StartTime::toBundleStartDuration);
     }

com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java

@@ -17,6 +17,8 @@
 
 import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC;
 
+import javax.inject.Inject;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
@@ -30,7 +32,6 @@
 import com.osgifx.console.executor.Executor;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.concurrent.Task;
 
 public final class AgentConnectedAddon {

com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java

@@ -22,6 +22,10 @@
 import java.time.Duration;
 import java.util.concurrent.ScheduledFuture;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -34,10 +38,6 @@
 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 {
 
     private static final Duration INITIAL_DELAY = Duration.ofSeconds(0);

com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java

@@ -18,15 +18,15 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
 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 {
 
     private final Map<String, Object> modifiableProperties = Maps.newHashMap();

com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java

@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.addon;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.EventTopic;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -24,7 +26,6 @@
 import org.eclipse.fx.ui.workbench.renderers.base.widget.WWindow;
 import org.osgi.service.event.Event;
 
-import jakarta.inject.Inject;
 import javafx.stage.Stage;
 
 public final class WindowResizeDisablerAddon {

com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java

@@ -17,13 +17,14 @@
 
 import static com.osgifx.console.constants.FxConstants.STANDARD_CSS;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.di.LocalInstance;
 import org.osgi.framework.BundleContext;
 
 import com.osgifx.console.util.fx.Fx;
 
-import jakarta.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java

@@ -25,6 +25,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.di.LocalInstance;
 import org.osgi.framework.BundleContext;
@@ -33,7 +35,6 @@
 import com.osgifx.console.application.fxml.controller.MqttConnectionSettingsDialogController;
 import com.osgifx.console.util.fx.Fx;
 
-import jakarta.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java

@@ -25,6 +25,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
 import org.eclipse.fx.core.di.LocalInstance;
 import org.osgi.framework.BundleContext;
@@ -33,7 +35,6 @@
 import com.osgifx.console.application.fxml.controller.SocketConnectionSettingsDialogController;
 import com.osgifx.console.util.fx.Fx;
 
-import jakarta.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java

@@ -23,6 +23,8 @@
 
 import java.util.Optional;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
@@ -35,7 +37,6 @@
 import com.google.common.primitives.Ints;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java

@@ -23,6 +23,8 @@
 
 import java.util.Optional;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
@@ -35,7 +37,6 @@
 import com.google.common.primitives.Ints;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java

@@ -19,6 +19,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.apache.commons.text.StringSubstitutor;
 import org.controlsfx.control.HyperlinkLabel;
 import org.eclipse.e4.core.di.extensions.OSGiBundle;
@@ -27,7 +29,6 @@
 import org.eclipse.fx.core.log.Log;
 import org.osgi.framework.BundleContext;
 
-import jakarta.inject.Inject;
 import javafx.application.Application;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java

@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.fxml.controller;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.table.TableFilter;
 import org.eclipse.fx.core.di.ContextBoundValue;
 import org.eclipse.fx.core.di.ContextValue;
@@ -26,7 +28,6 @@
 import com.osgifx.console.application.preference.ConnectionsProvider;
 import com.osgifx.console.util.fx.DTOCellValueFactory;
 
-import jakarta.inject.Inject;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java

@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.fxml.controller;
 
+import javax.inject.Inject;
+
 import org.controlsfx.control.table.TableFilter;
 import org.eclipse.fx.core.di.ContextBoundValue;
 import org.eclipse.fx.core.di.ContextValue;
@@ -25,7 +27,6 @@
 import com.osgifx.console.application.preference.ConnectionsProvider;
 import com.osgifx.console.util.fx.DTOCellValueFactory;
 
-import jakarta.inject.Inject;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;

com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java

@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.osgifx.console.application.handler;
 
+import javax.inject.Inject;
+
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
@@ -23,8 +25,6 @@
 
 import com.osgifx.console.application.dialog.AboutApplicationDialog;
 
-import jakarta.inject.Inject;
-
 public final class AboutApplicationHandler {
 
     @Log

com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java

@@ -19,6 +19,9 @@
 import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.REMOTE_RPC;
 import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.SNAPSHOT;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
@@ -38,8 +41,6 @@
 import com.osgifx.console.supervisor.factory.SupervisorFactory;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
 import javafx.concurrent.Task;
 
 public final class ConnectToLocalAgentHandler {

com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java

@@ -22,6 +22,8 @@
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.controlsfx.dialog.ProgressDialog;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -49,7 +51,6 @@
 import com.osgifx.console.util.fx.Fx;
 import com.osgifx.console.util.fx.FxDialog;
 
-import jakarta.inject.Inject;
 import javafx.concurrent.Task;
 
 public final class ConnectToMqttAgentHandler {