Skip to content

Expand version range of jakarta.annotation to include 3.x. #2640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merks merged 2 commits into from
Apr 30, 2026
Merged

Expand version range of jakarta.annotation to include 3.x. #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634a84e
Expand version range of jakarta.annotation to include 3.x.
merks Apr 30, 2026
7234590
Version bump(s) for 4.40 stream
eclipse-platform-bot Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.208.0",
org.eclipse.e4.ui.di,
org.eclipse.e4.ui.services
Bundle-RequiredExecutionEnvironment: JavaSE-21
Import-Package: jakarta.annotation;version="[2.0.0,3.0.0)",
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
jakarta.inject;version="[2.0.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.debug.ui.launchview;x-internal:=true,
Expand Down
4 changes: 2 additions & 2 deletions runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.e4.core.di.extensions.supplier
Bundle-Version: 0.17.1000.qualifier
Bundle-Version: 0.17.1100.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Capability: osgi.extender;
filter:="(&(osgi.extender=osgi.component)(version>=1.3)(!(version>=2.0)))"
Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
Import-Package: jakarta.annotation;version="[2.0.0,4.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,
Expand Down
4 changes: 2 additions & 2 deletions runtime/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.core.di
Bundle-Version: 1.9.700.qualifier
Bundle-Version: 1.9.800.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand All @@ -15,7 +15,7 @@ Export-Package: org.eclipse.e4.core.di;version="1.7.0",
org.eclipse.e4.core.internal.di.osgi;x-internal:=true,
org.eclipse.e4.core.internal.di.shared;x-friends:="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di.extensions.supplier"
Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport
Import-Package: jakarta.annotation;version="[2,3)",
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
jakarta.inject;version="[2,3)",
javax.annotation;version="[1.3.0,2.0.0)";resolution:=optional,
javax.inject;version="[1.0.0,2.0.0)";resolution:=optional,
Expand Down
4 changes: 2 additions & 2 deletions runtime/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Bundle-SymbolicName: org.eclipse.e4.core.services;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-Version: 2.5.300.qualifier
Bundle-Version: 2.5.400.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: jakarta.annotation;version="[2.0.0,3.0.0)",
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
jakarta.inject;version="[2.0.0,3.0.0)",
org.eclipse.osgi.service.debug;version="1.1.0",
org.eclipse.osgi.service.localization;version="1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.equinox.preferences;bundle-version="3.3.0",
org.eclipse.e4.core.services;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
jakarta.inject;version="[2.0.0,3.0.0)",
org.assertj.core.api,
org.eclipse.osgi.service.datalocation,
Expand Down
2 changes: 1 addition & 1 deletion ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.208.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: jakarta.annotation;version="[2.1.0,3.0.0)",
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
org.osgi.service.event;version="[1.4.0,2.0.0)",
org.osgi.service.event.propertytypes;version="[1.4.0,2.0.0)"
Export-Package: org.eclipse.tips.ide.internal;x-internal:=true
Expand Down
2 changes: 1 addition & 1 deletion ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ 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-21
Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
Import-Package: jakarta.annotation;version="[2.0.0,4.0.0)",
jakarta.inject;version="[2.0.0,3.0.0)",
javax.xml.parsers,
javax.xml.transform,
Expand Down
Loading