Bug 462726 - Ship a javax.annotation replacement who delegates to the

JRE

13 files changed, 13 insertions, 48 deletions

diff --git a/bundles/runtime/org.eclipse.fx.core.di.context.tests/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.di.context.tests/META-INF/MANIFEST.MF
index 55b0abcce..ee0a80a97 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context.tests/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.di.context.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
  org.eclipse.core.databinding;bundle-version="1.4.1",
  org.eclipse.core.databinding.property;bundle-version="1.4.200",
  org.eclipse.fx.core;bundle-version="0.9.0"
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation;version="1.1.0";resolution:=optional,
  javax.inject;version="1.0.0",
  org.osgi.framework;version="1.8.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
index ec1233b58..a4ce5c13d 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.fx.core.di;bundle-version="0.9.0",
  org.eclipse.e4.core.di,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.e4.core.services
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation;version="1.1.0";resolution:=optional,
  javax.inject;version="1.0.0",
  org.osgi.framework;version="1.8.0"
 Service-Component: OSGI-INF/services/*
diff --git a/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
index 221f81260..f6573bf3a 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Di
 Bundle-SymbolicName: org.eclipse.fx.core.di
 Bundle-Version: 2.0.0.qualifier
-Import-Package: javax.annotation;version="1.2.0",
+Import-Package: javax.annotation;version="1.2.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.fx.core;bundle-version="0.9.0",
diff --git a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
index 707e16113..8325057fc 100755
--- a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.core

 Bundle-Version: 2.0.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Import-Package: javax.annotation;version="1.2.0",

+Import-Package: javax.annotation;version="1.2.0";resolution:=optional,

  javax.inject;version="1.0.0",

  org.apache.commons.lang.text;version="2.6.0",

  org.osgi.framework;version="1.8.0";resolution:=optional

diff --git a/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
index c234cd9d7..85c626306 100755
--- a/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.fx.core.fxml;bundle-version="1.2.0",
  org.eclipse.fx.core.di.context;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.annotation;version="1.0.0",
+Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.fx.ui.di
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
index 88ef2273e..1231a2f88 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.fx.ui.keybindings;bundle-version="0.9.0",
  org.eclipse.fx.core;bundle-version="0.9.0",
  org.eclipse.emf.ecore;bundle-version="2.9.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Import-Package: javax.annotation;version="1.2.0",
+Import-Package: javax.annotation;version="1.2.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Export-Package: org.eclipse.fx.ui.keybindings.e4
diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
index 6f9b14dcf..6d38be212 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.commands;bundle-version="3.6.0",
  org.eclipse.e4.core.contexts;bundle-version="1.1.0",
  org.eclipse.e4.core.di;bundle-version="1.1.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Import-Package: javax.annotation;version="1.0.0",
+Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Export-Package: org.eclipse.fx.ui.keybindings,
  org.eclipse.fx.ui.keybindings.service
diff --git a/bundles/runtime/org.eclipse.fx.ui.modelviewer/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.modelviewer/META-INF/MANIFEST.MF
index b3883617a..fda47ca30 100644
--- a/bundles/runtime/org.eclipse.fx.ui.modelviewer/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.modelviewer/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Modelviewer
 Bundle-SymbolicName: org.eclipse.fx.ui.modelviewer;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: javax.annotation;version="1.1.0",
+Import-Package: javax.annotation;version="1.1.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.0.1",
  org.eclipse.fx.ui.databinding;bundle-version="0.9.0",
diff --git a/bundles/runtime/org.eclipse.fx.ui.services.controlprovider/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.services.controlprovider/META-INF/MANIFEST.MF
index c399872d0..10c2fae54 100644
--- a/bundles/runtime/org.eclipse.fx.ui.services.controlprovider/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.services.controlprovider/META-INF/MANIFEST.MF
@@ -6,41 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.fx.ui.services,
  org.eclipse.fx.ui.controls
-Import-Package: javafx.animation;version="2.2.0",
- javafx.application;version="2.2.0",
- javafx.beans;version="2.2.0",
- javafx.beans.binding;version="2.2.0",
- javafx.beans.property;version="2.2.0",
- javafx.beans.property.adapter;version="2.2.0",
- javafx.beans.value;version="2.2.0",
- javafx.collections;version="2.2.0",
- javafx.collections.transformation;version="8.0.0",
- javafx.concurrent;version="2.2.0",
- javafx.css;version="8.0.0",
- javafx.embed.swing;version="2.2.0",
- javafx.embed.swt;version="2.2.0",
- javafx.event;version="2.2.0",
- javafx.fxml;version="2.2.0",
- javafx.geometry;version="2.2.0",
- javafx.print;version="8.0.0",
- javafx.scene;version="2.2.0",
- javafx.scene.canvas;version="2.2.0",
- javafx.scene.chart;version="2.2.0",
- javafx.scene.control;version="2.2.0",
- javafx.scene.control.cell;version="2.2.0",
- javafx.scene.effect;version="2.2.0",
- javafx.scene.image;version="2.2.0",
- javafx.scene.input;version="2.2.0",
- javafx.scene.layout;version="2.2.0",
- javafx.scene.media;version="2.2.0",
- javafx.scene.paint;version="2.2.0",
- javafx.scene.shape;version="2.2.0",
- javafx.scene.text;version="2.2.0",
- javafx.scene.transform;version="2.2.0",
- javafx.scene.web;version="2.2.0",
- javafx.stage;version="2.2.0",
- javafx.util;version="2.2.0",
- javafx.util.converter;version="2.2.0",
- org.eclipse.fx.core
+Import-Package: org.eclipse.fx.core
 Service-Component: OSGI-INF/services/fonticonnodeprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
index c5180eb56..abd7d185d 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.e4.core.contexts;bundle-version="1.1.0",
  org.eclipse.core.commands;bundle-version="3.6.100"
 Export-Package: org.eclipse.fx.ui.workbench.base;x-friends:="org.eclipse.fx.ui.workbench.fx,org.eclipse.fx.ui.workbench.renderers.fx,org.eclipse.fx.ui.workbench.renderers.base",
  org.eclipse.fx.ui.workbench.base.rendering;x-friends:="org.eclipse.fx.ui.workbench.fx,org.eclipse.fx.ui.workbench.renderers.fx,org.eclipse.fx.ui.workbench.renderers.base"
-Import-Package: javax.annotation;version="1.2.0",
+Import-Package: javax.annotation;version="1.2.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Bundle-Activator: org.eclipse.fx.ui.workbench.base.internal.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
index 1fed06f57..2225a04df 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
  org.eclipse.e4.ui.services;bundle-version="1.1.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.eclipse.fx.ui.workbench.services;bundle-version="1.2.0"
-Import-Package: javax.annotation;version="1.0.0",
+Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0",
  org.osgi.service.event;version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
index 614319273..eef01907d 100755
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
  org.eclipse.fx.ui.controls;bundle-version="1.2.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.10.0",
  org.eclipse.fx.ui.workbench.services;bundle-version="1.2.0"
-Import-Package: javax.annotation;version="1.0.0",
+Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Service-Component: OSGI-INF/popupfunction.xml,
  OSGI-INF/defaultdndfeedback.xml
diff --git a/bundles/runtime/org.eclipse.fx.ui.workbench.services/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.workbench.services/META-INF/MANIFEST.MF
index 78919479e..acaaf0a56 100644
--- a/bundles/runtime/org.eclipse.fx.ui.workbench.services/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.workbench.services/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
 Export-Package: org.eclipse.fx.ui.workbench.services,
  org.eclipse.fx.ui.workbench.services.lifecycle,
  org.eclipse.fx.ui.workbench.services.lifecycle.annotation
-Import-Package: javax.annotation;version="1.2.0",
+Import-Package: javax.annotation;version="1.2.0";resolution:=optional,
  javax.inject;version="1.0.0"
 Service-Component: OSGI-INF/lifecyclecomponent.xml
 Bundle-ActivationPolicy: lazy