From ad31434b1e34c1cef863057239280311c6ebc4f3 Mon Sep 17 00:00:00 2001
From: Olivier Prouvost
Date: Tue, 23 Oct 2018 20:26:00 +0200
Subject: Bug 540075 - e4 bundle spy, css spy and css scratchpad broken with
 JDK11

Change-Id: Icf7675ab347164ec78530885f11a32ab43988390
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>---
 .../org.eclipse.e4.core.tools.update/category.xml  |  6 +--
 .../META-INF/MANIFEST.MF                           |  1 +
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../META-INF/MANIFEST.MF                           |  3 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../META-INF/MANIFEST.MF                           |  5 +-
 .../META-INF/MANIFEST.MF                           |  1 -
 .../org.eclipse.e4.tools.spy/META-INF/MANIFEST.MF  |  2 +-
 .../feature.xml                                    |  7 +++
 .../feature.xml                                    | 63 ----------------------
 pom.xml                                            |  2 +-
 11 files changed, 20 insertions(+), 74 deletions(-)

diff --git a/build/org.eclipse.e4.core.tools.update/category.xml b/build/org.eclipse.e4.core.tools.update/category.xml
index 697c88f4..29d40230 100644
--- a/build/org.eclipse.e4.core.tools.update/category.xml
+++ b/build/org.eclipse.e4.core.tools.update/category.xml
@@ -9,9 +9,6 @@
    <feature url="features/org.eclipse.e4.tools.preference.spy.feature_0.1.0.qualifier.jar" id="org.eclipse.e4.tools.preference.spy.feature" version="0.1.0.qualifier">
       <category name="org.eclipse.e4.tools.preference.spy"/>
    </feature>
-   <feature url="features/org.eclipse.e4.tools.model.spy.feature_0.1.0.qualifier.jar" id="org.eclipse.e4.tools.model.spy.feature" version="0.1.0.qualifier">
-      <category name="org.eclipse.e4.tools.model.spy"/>
-   </feature>
    <feature url="features/org.eclipse.e4.tools.spies.feature_0.18.0.qualifier.jar" id="org.eclipse.e4.tools.spies.feature" version="0.18.0.qualifier">
       <category name="org.eclipse.e4.tools.spies.feature"/>
    </feature>
@@ -21,6 +18,9 @@
    <feature url="features/org.eclipse.e4.tools.event.spy.feature_0.15.0.qualifier.jar" id="org.eclipse.e4.tools.event.spy.feature" version="0.15.0.qualifier">
       <category name="org.eclipse.e4.tools.event.spy"/>
    </feature>
+   <feature url="features/org.eclipse.e4.tools.model.spy.feature_0.1.100.qualifier.jar" id="org.eclipse.e4.tools.model.spy.feature" version="0.1.100.qualifier">
+      <category name="org.eclipse.e4.tools.model.spy"/>
+   </feature>
    <category-def name="org.eclipse.e4.tools.css.spy" label="Eclipse 4 - CSS Spy"/>
    <category-def name="org.eclipse.e4.tools.event.spy" label="Eclipse 4 - Event Spy"/>
    <category-def name="org.eclipse.e4.tools.context.spy" label="Eclipse 4 - Context Spy"/>
diff --git a/bundles/org.eclipse.e4.tools.bundle.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.bundle.spy/META-INF/MANIFEST.MF
index 104b816f..9075d84b 100644
--- a/bundles/org.eclipse.e4.tools.bundle.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.bundle.spy/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
 Export-Package: org.eclipse.e4.tools.bundles.spy
 Bundle-Activator: org.eclipse.e4.tools.bundles.spy.BundleSpyActivator
 Bundle-ActivationPolicy: lazy
+Import-Package: javax.annotation;version="1.2.0"
diff --git a/bundles/org.eclipse.e4.tools.context.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.context.spy/META-INF/MANIFEST.MF
index aab19139..389a0af7 100644
--- a/bundles/org.eclipse.e4.tools.context.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.context.spy/META-INF/MANIFEST.MF
@@ -18,5 +18,5 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.e4.ui.workbench.swt,
  org.eclipse.e4.tools.spy;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.annotation;version="1.1.0"
+Import-Package: javax.annotation;version="1.2.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF
index f4f99385..3fc81b57 100644
--- a/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.e4.core.di.extensions
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject,
+Import-Package: javax.annotation;version="1.2.0",
+ javax.inject,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.core.services.log,
diff --git a/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF
index 9f9f8b62..191c1b5d 100644
--- a/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.e4.ui.di
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation;version="1.1.0"
+Import-Package: javax.annotation;version="1.2.0"
 Export-Package: org.eclipse.e4.tools.event.spy,
  org.eclipse.e4.tools.event.spy.internal.core;x-internal:=true,
  org.eclipse.e4.tools.event.spy.internal.model;x-internal:=true,
diff --git a/bundles/org.eclipse.e4.tools.model.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.model.spy/META-INF/MANIFEST.MF
index 59ef00d0..ce137e7e 100644
--- a/bundles/org.eclipse.e4.tools.model.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.model.spy/META-INF/MANIFEST.MF
@@ -15,9 +15,10 @@ Require-Bundle: org.eclipse.e4.ui.services;bundle-version="0.9.1",
  org.eclipse.e4.core.di;bundle-version="0.9.0",
  org.eclipse.jface;bundle-version="3.6.0",
  org.eclipse.equinox.registry;bundle-version="3.5.0",
- org.eclipse.e4.ui.di;bundle-version="0.9.0"
+ org.eclipse.e4.ui.di;bundle-version="0.9.0",
+ javax.inject;bundle-version="1.0.0"
 Bundle-Vendor: %Bundle-Vendor
 Service-Component: OSGI-INF/extensionlookup.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="1.0.0"
+Import-Package: javax.annotation;version="1.2.0"
 Export-Package: org.eclipse.e4.tools.model.spy;x-internal:=true
diff --git a/bundles/org.eclipse.e4.tools.preference.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.preference.spy/META-INF/MANIFEST.MF
index 578371c6..9b0ae90a 100644
--- a/bundles/org.eclipse.e4.tools.preference.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.preference.spy/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.e4.core.di.extensions;bundle-version="0.12.0",
  org.eclipse.e4.core.services;bundle-version="1.2.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
- javax.annotation,
  javax.inject,
  org.eclipse.e4.ui.di;bundle-version="1.0.0",
  org.eclipse.core.databinding;bundle-version="1.4.1",
diff --git a/bundles/org.eclipse.e4.tools.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.spy/META-INF/MANIFEST.MF
index d7513531..e719ca2e 100644
--- a/bundles/org.eclipse.e4.tools.spy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.spy/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.ui.di,
  org.eclipse.equinox.event
-Import-Package: javax.annotation;version="1.1.0"
+Import-Package: javax.annotation;version="1.2.0"
 Bundle-Vendor: Eclipse Foundation
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.e4.tools.spy;x-internal:=true
diff --git a/features/org.eclipse.e4.tools.css.spy.feature/feature.xml b/features/org.eclipse.e4.tools.css.spy.feature/feature.xml
index 3f2f5cc8..0df53280 100644
--- a/features/org.eclipse.e4.tools.css.spy.feature/feature.xml
+++ b/features/org.eclipse.e4.tools.css.spy.feature/feature.xml
@@ -33,4 +33,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.e4.tools.spy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.e4.tools.model.spy.feature/feature.xml b/features/org.eclipse.e4.tools.model.spy.feature/feature.xml
index 6b286a0b..038a5416 100644
--- a/features/org.eclipse.e4.tools.model.spy.feature/feature.xml
+++ b/features/org.eclipse.e4.tools.model.spy.feature/feature.xml
@@ -33,67 +33,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.e4.tools.emf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.e4.tools.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.databinding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.databinding.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/pom.xml b/pom.xml
index 8d0d4e3f..5507b32b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
  <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.7.2-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
-- 
cgit v1.2.3