Switch from javax to jakarta

jonahgraham · Oct 8, 2024 · d180874 · d180874
1 parent e50f81b
commit d180874
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true
-Bundle-Version: 1.2.400.qualifier
+Bundle-Version: 1.2.500.qualifier
 Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
@@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.ui;bundle-version="3.11.200",
  org.eclipse.launchbar.core;bundle-version="2.0.0",
  org.eclipse.launchbar.ui;bundle-version="2.0.0"
-Import-Package: javax.annotation,
- javax.inject,
+Import-Package: jakarta.annotation,
+ jakarta.inject,
  org.osgi.service.event;version="1.4.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy

diff --git a/...aunchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java b/...aunchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java
@@ -15,9 +15,6 @@
  *******************************************************************************/
 package org.eclipse.launchbar.ui.controls.internal;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.CoreException;
@@ -44,6 +41,9 @@
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.handlers.IHandlerService;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+
 public class LaunchBarControl implements ILaunchBarListener {
 	public static final String ID = "org.eclipse.launchbar"; //$NON-NLS-1$
 	public static final String CLASS_URI = "bundleclass://" + Activator.PLUGIN_ID + "/" //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/...unchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java b/...unchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java
@@ -15,8 +15,6 @@
  *******************************************************************************/
 package org.eclipse.launchbar.ui.controls.internal;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -31,6 +29,8 @@
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.widgets.Widget;
 
+import jakarta.inject.Inject;
+
 public class LaunchBarInjector {
 
 	@Inject