Migrate PDE from javax.inject/annotation to jakarta.inject/annotation

Part of eclipse-platform/eclipse.platform.releng.aggregator#1056
alshamams · Oct 30, 2023 · d551a60 · d551a60
1 parent 5cb1152
commit d551a60
Show file tree

Hide file tree

Showing 54 changed files with 121 additions and 123 deletions.
diff --git a/...de.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractTypeLeakDetector.java b/...de.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractTypeLeakDetector.java
@@ -88,10 +88,9 @@ protected boolean isProblem(IReference reference, IProgressMonitor monitor) {
 					// this is an unexpected condition - the enclosing type is
 					// visible, but it has no annotations - log an error
 					String memberName = member.getName();
-					if (memberName != null) {
-						if (!memberName.startsWith("javax.")) { //$NON-NLS-1$
-							ApiPlugin.log(Status.info(MessageFormat.format(BuilderMessages.AbstractTypeLeakDetector_vis_type_has_no_api_description, memberName)));
-						}
+					if (memberName != null && !memberName.startsWith("javax.") && !memberName.startsWith("jakarta.")) { //$NON-NLS-1$ //$NON-NLS-2$
+						ApiPlugin.log(Status.info(MessageFormat.format(
+								BuilderMessages.AbstractTypeLeakDetector_vis_type_has_no_api_description, memberName)));
 					}
 				} else {
 					// enclosing type is not visible - this is a problem

diff --git a/...ipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/MethodLeakDetector.java b/...ipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/MethodLeakDetector.java
@@ -98,10 +98,9 @@ protected boolean isProblem(IReference reference, IProgressMonitor monitor) {
 					// this is an unexpected condition - the enclosing type is
 					// visible, but it has no annotations - log an error
 					String typeName = type.getName();
-					if (typeName != null) {
-						if (!typeName.startsWith("javax.")) { //$NON-NLS-1$
-							ApiPlugin.log(Status.info(MessageFormat.format(BuilderMessages.AbstractTypeLeakDetector_vis_type_has_no_api_description, typeName)));
-						}
+					if (typeName != null && !typeName.startsWith("javax.") && !typeName.startsWith("jakarta.")) { //$NON-NLS-1$ //$NON-NLS-2$
+						ApiPlugin.log(Status.info(MessageFormat.format(
+								BuilderMessages.AbstractTypeLeakDetector_vis_type_has_no_api_description, typeName)));
 					}
 				} else {
 					// enclosing type is not visible - this is a problem

diff --git a/ui/org.eclipse.pde.spy.bundle/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.bundle/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.spy.bundle;singleton:=true
-Bundle-Version: 0.13.100.qualifier
+Bundle-Version: 0.13.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.pde.spy.bundle
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.e4.core.di,
  org.eclipse.e4.ui.di
 Bundle-Localization: plugin
-Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
- javax.inject;version="[1.0.0,2.0.0)"
+Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)"
 Bundle-Vendor: %provider-name
 Bundle-ActivationPolicy: lazy
diff --git a/ui/org.eclipse.pde.spy.bundle/src/org/eclipse/pde/spy/bundle/BundleSpyPart.java b/ui/org.eclipse.pde.spy.bundle/src/org/eclipse/pde/spy/bundle/BundleSpyPart.java
@@ -16,9 +16,6 @@
 
 import java.util.Iterator;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.ui.di.Focus;
@@ -53,6 +50,9 @@
 import org.osgi.framework.BundleException;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 /**
  * This class is the main part of the bundle spy. It displays a tableviewer with
  * all bundles

diff --git a/...rg.eclipse.pde.spy.bundle/src/org/eclipse/pde/spy/bundle/internal/BundleDataProvider.java b/...rg.eclipse.pde.spy.bundle/src/org/eclipse/pde/spy/bundle/internal/BundleDataProvider.java
@@ -13,8 +13,6 @@
  *******************************************************************************/
 package org.eclipse.pde.spy.bundle.internal;
 
-import javax.inject.Inject;
-
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.pde.spy.bundle.BundleSpyPart;
@@ -24,6 +22,8 @@
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.Bundle;
 
+import jakarta.inject.Inject;
+
 /**
  * The column Label and content Provider used to display information in context
  * data TreeViewer. Two instances for label provider are created : one for key,

diff --git a/ui/org.eclipse.pde.spy.context/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.context/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.spy.context;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Bundle-Vendor: %provider-name
 Automatic-Module-Name: org.eclipse.pde.spy.context
 Bundle-RequiredExecutionEnvironment: JavaSE-17
@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.jface;bundle-version="3.9.0",
  org.eclipse.e4.core.services;bundle-version="1.1.0",
  org.eclipse.pde.spy.core;bundle-version="1.0.100"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
- javax.inject;version="[1.0.0,2.0.0)"
+Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)"
 Bundle-Localization: plugin
 Export-Package: org.eclipse.pde.spy.context
 
diff --git a/...g.eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextDataFilter.java b/...g.eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextDataFilter.java
@@ -18,9 +18,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Creatable;
 import org.eclipse.e4.core.internal.contexts.Computation;
@@ -30,6 +27,9 @@
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @SuppressWarnings("restriction")
 @Creatable
 @Singleton

diff --git a/ui/org.eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextDataPart.java b/ui/org.eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextDataPart.java
@@ -13,11 +13,6 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.spy.context;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
@@ -39,6 +34,11 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 /**
  * This part listen to selection, and if it is an EclipseContext, it displays
  * its information It is used in the integrated ContextSpyPart and (in the

diff --git a/...eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextDataProvider.java b/...eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextDataProvider.java
@@ -19,8 +19,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.internal.contexts.Computation;
 import org.eclipse.e4.core.internal.contexts.EclipseContext;
 import org.eclipse.jface.resource.FontRegistry;
@@ -39,6 +37,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.inject.Inject;
+
 /**
  * The column Label and content Provider used to display information in context
  * data TreeViewer. Two instances for label provider are created : one for key,

diff --git a/....eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextSpyProvider.java b/....eclipse.pde.spy.context/src/org/eclipse/pde/internal/spy/context/ContextSpyProvider.java
@@ -18,8 +18,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.internal.contexts.EclipseContext;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -31,6 +29,8 @@
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
 
+import jakarta.inject.Inject;
+
 @SuppressWarnings("restriction")
 /**
  * This label and treecontent provider is used by ContextSpyPart to display

diff --git a/ui/org.eclipse.pde.spy.context/src/org/eclipse/pde/spy/context/ContextSpyPart.java b/ui/org.eclipse.pde.spy.context/src/org/eclipse/pde/spy/context/ContextSpyPart.java
@@ -13,10 +13,6 @@
  *******************************************************************************/
 package org.eclipse.pde.spy.context;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.ui.di.Focus;
@@ -48,6 +44,10 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+
 /**
  * This class is the main part of the context spy. It creates a treeviewer and
  * the context data part listening to context selection

diff --git a/ui/org.eclipse.pde.spy.core/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.spy.core;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Automatic-Module-Name: org.eclipse.pde.spy.core
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.di,
  org.eclipse.emf.ecore
-Import-Package: javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: jakarta.inject;version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore
 Bundle-Vendor: %provider-name
diff --git a/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyHandler.java b/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyHandler.java
@@ -17,8 +17,6 @@
 import java.text.MessageFormat;
 import java.util.List;
 
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -38,6 +36,8 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
+import jakarta.inject.Named;
+
 public class SpyHandler {
 	private static final String E4_SPIES_WINDOW = "org.eclipse.pde.spy.core.window";
 	private static final String E4_SPIES_PART_STACK = "org.eclipse.pde.spy.core.partStack";

diff --git a/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyProcessor.java b/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyProcessor.java
@@ -19,8 +19,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.ILog;
@@ -42,6 +40,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
+import jakarta.inject.Inject;
+
 /** A base class for all spies processors */
 public class SpyProcessor {
 	static final String SPY_TAG = "Spy";

diff --git a/ui/org.eclipse.pde.spy.css/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.css/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
  org.eclipse.pde.spy.core;bundle-version="1.0.200"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
- javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)",
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.ui.services,

diff --git a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java
@@ -18,9 +18,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.css.core.dom.ExtendedDocumentCSS;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
@@ -43,6 +40,9 @@
 import org.w3c.dom.stylesheets.StyleSheet;
 import org.w3c.dom.stylesheets.StyleSheetList;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 @SuppressWarnings("restriction")
 public class CSSScratchPadPart {
 	@Inject

diff --git a/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java b/ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java
@@ -23,10 +23,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
@@ -91,6 +87,10 @@
 import org.w3c.dom.css.CSSStyleDeclaration;
 import org.w3c.dom.css.CSSValue;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 @SuppressWarnings("restriction")
 public class CssSpyPart {
 

diff --git a/ui/org.eclipse.pde.spy.event/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.event/META-INF/MANIFEST.MF
@@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.databinding.property;bundle-version="1.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
- javax.inject;version="[1.0.0,2.0.0)",
+Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
+ jakarta.inject;version="[2.0.0,3.0.0)",
  org.osgi.service.event;version="[1.4.0,2.0.0)"
 Bundle-Localization: plugin
 Export-Package: org.eclipse.pde.spy.event

diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/EventSpyPart.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/ui/EventSpyPart.java
@@ -19,10 +19,6 @@
 
 import java.util.Collection;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -39,6 +35,10 @@
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.inject.Inject;
+
 public class EventSpyPart implements EventMonitor.NewEventListener {
 
 	private static final String[] SHOW_FILTER_LINK_TEXT = new String[] { Messages.EventSpyPart_ShowFilters, Messages.EventSpyPart_HideFilters };

diff --git a/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/util/LoggerWrapper.java b/ui/org.eclipse.pde.spy.event/src/org/eclipse/pde/spy/event/internal/util/LoggerWrapper.java
@@ -13,13 +13,13 @@
  *******************************************************************************/
 package org.eclipse.pde.spy.event.internal.util;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.di.annotations.Creatable;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.pde.spy.event.Constants;
 
+import jakarta.inject.Inject;
+
 @SuppressWarnings("restriction")
 @Creatable
 public class LoggerWrapper extends Logger {

diff --git a/ui/org.eclipse.pde.spy.model/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.spy.model/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Bundle-Localization: plugin
 Bundle-Vendor: %provider-name
 Service-Component: OSGI-INF/extensionlookup.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="[1.0.0,2.0.0)"
+Import-Package: jakarta.inject;version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.pde.spy.model;x-internal:=true
 Automatic-Module-Name: org.eclipse.pde.spy.model
diff --git a/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/ModelSpyPart.java b/ui/org.eclipse.pde.spy.model/src/org/eclipse/pde/spy/model/ModelSpyPart.java
@@ -13,15 +13,15 @@
  ******************************************************************************/
 package org.eclipse.pde.spy.model;
 
-import javax.inject.Inject;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.tools.emf.ui.common.IModelResource;
 import org.eclipse.e4.tools.emf.ui.internal.wbm.ApplicationModelEditor;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.model.application.MApplication;
 
+import jakarta.inject.Inject;
+
 @SuppressWarnings("restriction")
 public class ModelSpyPart {