diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF index 782234bf915..67add91f6d5 100644 --- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF +++ b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 0.17.300.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))" -Import-Package: javax.annotation;version="[1.3.0,2.0.0)", +Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)", org.eclipse.core.runtime.preferences;version="3.3.0", org.eclipse.e4.core.contexts;version="1.6.0", org.eclipse.e4.core.di, diff --git a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java index 4f58b391600..911779560e6 100644 --- a/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java +++ b/runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java @@ -16,6 +16,7 @@ *******************************************************************************/ package org.eclipse.e4.core.di.internal.extensions; +import jakarta.annotation.PreDestroy; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; @@ -26,7 +27,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Objects; -import javax.annotation.PreDestroy; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.IInjector; import org.eclipse.e4.core.di.InjectionException; diff --git a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF index f72192826fc..5c0b429b358 100644 --- a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF +++ b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.0.0", org.eclipse.tips.core;bundle-version="0.1.0", org.eclipse.tips.ui;bundle-version="0.1.0", org.eclipse.tips.json -Import-Package: javax.annotation;version="[1.3.0,2.0.0)", +Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)", org.osgi.service.event;version="[1.4.0,2.0.0)" Export-Package: org.eclipse.tips.ide.internal;x-internal:=true Bundle-Vendor: %Bundle-Vendor diff --git a/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java b/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java index ee1147d24db..c4de26bb346 100644 --- a/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java +++ b/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java @@ -1,12 +1,12 @@ package org.eclipse.tips.ide.internal; -import javax.annotation.PostConstruct; - import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.tips.ui.internal.TipComposite; +import jakarta.annotation.PostConstruct; + public class TipPart { @PostConstruct diff --git a/ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF b/ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF index 120ca762191..c88a0d1090c 100644 --- a/ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF +++ b/ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF @@ -27,8 +27,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.e4.ui.workbench, org.eclipse.e4.ui.model.workbench Bundle-RequiredExecutionEnvironment: JavaSE-17 -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)", javax.xml.parsers, javax.xml.transform, javax.xml.transform.dom, diff --git a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java index f025e65e766..f5c0c3902d6 100644 --- a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java +++ b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/IntroLaunchBar.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.MApplication;