Improve OSGi metadata about dependency to javax.inject/annotations

- Always use closed version ranges [1.X,2) with a minor lower bound Part of eclipse-platform/eclipse.platform.releng.aggregator#1056
HannesWell · May 1, 2023 · b6db455 · b6db455
1 parent 078f8e2
commit b6db455
Show file tree

Hide file tree

Showing 20 changed files with 35 additions and 35 deletions.
diff --git a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Version: 1.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.core.commands,
  org.eclipse.core.commands.common,
  org.eclipse.core.expressions,

diff --git a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.commands,
  org.eclipse.e4.core.commands.internal,
  org.eclipse.e4.core.services.log,

diff --git a/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.e4.ui.di
 Bundle-Version: 1.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.contexts;version="1.6.0",
  org.eclipse.e4.core.di.annotations;version="0.15.0",
  org.eclipse.e4.core.di.internal.extensions;version="0.15.0",

diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.e4.core.di;bundle-version="1.3.0",
  org.eclipse.e4.ui.workbench.swt,
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.e4.ui.services
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0"
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.e4.ui.progress

diff --git a/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.event;version="[1.4.0,2.0.0)"
 Require-Bundle: org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)",

diff --git a/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: fragment-gtk
 Bundle-Vendor: %providerName
 Eclipse-PlatformFilter: (osgi.ws=gtk)
-Import-Package: javax.annotation,
- javax.inject,
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.services.events,
  org.osgi.service.event;version="1.3.1"
 Automatic-Module-Name: org.eclipse.e4.ui.swt.gtk
diff --git a/bundles/org.eclipse.e4.ui.swt.win32/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.swt.win32/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: fragment-win32
 Bundle-Vendor: %providerName
 Eclipse-PlatformFilter: (osgi.ws=win32)
-Import-Package: javax.annotation,
- javax.inject,
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.services.events,
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.e4.ui.swt.win32
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.internal.workbench.swt,
  org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"

diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.e4.ui.workbench;bundle-version="0.9.0",
 Export-Package: org.eclipse.e4.ui.internal.workbench.renderers.swt;x-friends:="org.eclipse.ui.workbench",
  org.eclipse.e4.ui.workbench.renderers.swt;x-friends:="org.eclipse.e4.ui.workbench.addons.swt,org.eclipse.ui.workbench"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.e4.ui.workbench.renderers.swt
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
@@ -38,8 +38,8 @@ Export-Package: org.eclipse.e4.ui.internal.workbench.swt;x-friends:="org.eclipse
  org.eclipse.e4.ui.workbench.swt.factories;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.ui.workbench",
  org.eclipse.e4.ui.workbench.swt.internal.copy;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt",
  org.eclipse.e4.ui.workbench.swt.util;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.ui.workbench"
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.osgi.service.datalocation;version="1.2.0",
  org.eclipse.osgi.service.debug;version="1.1.0",
  org.osgi.framework;version="[1.5.0,2.0.0)",

diff --git a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
@@ -39,8 +39,8 @@ Service-Component: OSGI-INF/org.eclipse.e4.ui.internal.LocaleChangeServiceContex
  OSGI-INF/org.eclipse.e4.ui.internal.workbench.ModelAssembler.xml,
  OSGI-INF/org.eclipse.e4.ui.internal.workbench.PartServiceCreationFunction.xml,
  OSGI-INF/org.eclipse.e4.ui.internal.workbench.ProgressMonitorFunction.xml
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Require-Capability: osgi.extender;
   filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))",

diff --git a/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)",
 Export-Package: org.eclipse.ui.internal.ide.application;x-internal:=true,
  org.eclipse.ui.internal.ide.application.addons;x-internal:=true,
  org.eclipse.ui.internal.ide.application.dialogs;x-internal:=true
-Import-Package: javax.inject,
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.service.event;version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy

diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
@@ -65,8 +65,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.17.0,4.0.0)";resol
  org.eclipse.e4.core.di;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.e4.core.di.extensions;bundle-version="[0.14.0,1.0.0)",
  org.eclipse.ui.navigator;bundle-version="3.7.400"
-Import-Package: javax.annotation,
- javax.inject,
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.service.event;version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.ui.ide

diff --git a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
@@ -115,8 +115,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="2.11.0",
  org.eclipse.e4.core.di.extensions;bundle-version="0.13.0"
 Import-Package: com.ibm.icu.util,
- javax.annotation,
- javax.inject;version="1.0.0",
+ javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  javax.xml.parsers,
  org.eclipse.e4.core.commands,
  org.eclipse.e4.core.commands.internal,

diff --git a/examples/org.eclipse.e4.ui.examples.job/META-INF/MANIFEST.MF b/examples/org.eclipse.e4.ui.examples.job/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.e4.ui.di,
  org.eclipse.jface;bundle-version="3.10.0"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.di.annotations
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF b/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Activator: org.eclipse.ui.examples.adapterservice.snippets.SnippetActivator
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)"
 Require-Bundle: org.eclipse.equinox.app,
  org.eclipse.equinox.common;bundle-version="3.4.0",

diff --git a/tests/org.eclipse.e4.core.commands.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.core.commands.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.commands,
  org.eclipse.core.runtime,
  org.junit,
  org.eclipse.e4.core.di
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.contexts,
  org.osgi.framework;version="[1.5.0,2.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF
@@ -18,6 +18,6 @@ Export-Package: org.eclipse.e4.tools.compat.internal;version="0.12.0.qualifier";
  org.eclipse.e4.tools.compat.parts;version="0.12.0.qualifier";x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.workbench.swt
 Automatic-Module-Name: org.eclipse.e4.tools.compat
diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -31,8 +31,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.e4.emf.xpath,
  org.eclipse.ui.forms;bundle-version="3.7.200"
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)",
  org.osgi.service.event;version="[1.3.0,2.0.0)"
 Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",

diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.7.0",
  org.eclipse.e4.core.di;bundle-version="0.9.0"
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="[1.2.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.e4.tools.services