[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

wrong information in the manifest files of eclipse-platform-runtime



Hi All,

While investigating #1010983, I noticed that the manifest files of
eclipse-platform-runtime mentions that it needs javax.annotation
version="1.3.5", but in Debian we have version 1.3 as supplied by
libgeronimo-annotation-1.3-spec-java.

Unless anyone has any objection I will like to do a team upload with
the attached patch fixing the manifest files. Its only a change in the
manifest file to add a range of 1.3 to 1.3.5 for javax.annotation and
remove javax.annotation from "Require-Bundle".


-- 
Regards
Sudip
--- eclipse-platform-runtime-4.19.orig/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
+++ eclipse-platform-runtime-4.19/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: org.eclipse.core.runtime
  org.osgi.service.component.annotations;version="1.3.0";resolution:=optional,
  org.osgi.service.event;version="1.3.0",
  org.osgi.service.log;version="1.3.0",
- javax.annotation;version="1.3.5"
+ javax.annotation;version="[1.3,1.3.5]"
 Service-Component: OSGI-INF/org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier.xml,
  OSGI-INF/org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier.xml,
  OSGI-INF/org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier.xml,
--- eclipse-platform-runtime-4.19.orig/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
+++ eclipse-platform-runtime-4.19/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF
@@ -12,10 +12,10 @@ Export-Package: org.eclipse.e4.core.di;v
  org.eclipse.e4.core.internal.di;x-friends:="org.eclipse.e4.core.contexts",
  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,
- javax.annotation;bundle-version="[1.3.5,2.0.0)"
+Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.osgi.framework.log;version="1.1.0",
  org.osgi.framework;version="1.8.0",
- org.osgi.util.tracker;version="1.5.1"
+ org.osgi.util.tracker;version="1.5.1",
+ javax.annotation;version="[1.3,1.3.5]"
 Automatic-Module-Name: org.eclipse.e4.core.di
--- eclipse-platform-runtime-4.19.orig/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
+++ eclipse-platform-runtime-4.19/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Localization: plugin
 Bundle-Version: 2.2.600.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.annotation;version="1.3.5",
+Import-Package: javax.annotation;version="[1.3,1.3.5]",
  javax.inject;version="1.0.0",
  org.eclipse.osgi.service.debug;version="1.1.0",
  org.eclipse.osgi.service.localization;version="1.1.0",

Reply to: