From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 16 Jan 2020 10:49:18 +0000 (+0200)
Subject: Add javax.inject dependency for 4.13 support
X-Git-Tag: v1.43.0~135
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F3371%2F2;p=simantics%2Fplatform.git

Add javax.inject dependency for 4.13 support

After eclipse 4.13 org.eclipse.core.runtime no longer re-exports
javax.inject, which means annotations like javax.inject.Inject and
javax.inject.Named must be imported by importing the javax.inject
package explicitly in bundles that use it.

This change also works with the old 4.7 Eclipse.

gitlab #405

Change-Id: I752e97570ea4917633dd655e1c6b59d98751db87
---

diff --git a/bundles/org.simantics.debug.browser.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.debug.browser.ui/META-INF/MANIFEST.MF
index f08f88437..f377235cb 100644
--- a/bundles/org.simantics.debug.browser.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.debug.browser.ui/META-INF/MANIFEST.MF
@@ -16,5 +16,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Association for Decentralized Information Management in Industry THTH ry
-Import-Package: org.eclipse.core.expressions
+Import-Package: org.eclipse.core.expressions,
+ javax.inject
 Automatic-Module-Name: org.simantics.debug.browser.ui
diff --git a/bundles/org.simantics.diagram/META-INF/MANIFEST.MF b/bundles/org.simantics.diagram/META-INF/MANIFEST.MF
index 9d6016f31..6ca327d19 100644
--- a/bundles/org.simantics.diagram/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.diagram/META-INF/MANIFEST.MF
@@ -72,7 +72,8 @@ Export-Package: org.simantics.diagram,
  org.simantics.diagram.synchronization.graph.layer,
  org.simantics.diagram.synchronization.runtime,
  org.simantics.diagram.ui
-Import-Package: org.simantics.simulation.experiment
+Import-Package: org.simantics.simulation.experiment,
+ javax.inject
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.simantics.diagram.internal.Activator
 Bundle-Vendor: VTT Technical Research Center of Finland
diff --git a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
index b8a6da23c..f6f6fa484 100644
--- a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
@@ -97,5 +97,6 @@ Bundle-Activator: org.simantics.modeling.ui.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: VTT Technical Research Centre of Finland
 Import-Package: org.osgi.service.event,
- org.simantics.views
+ org.simantics.views,
+ javax.inject
 Automatic-Module-Name: org.simantics.modeling.ui
diff --git a/bundles/org.simantics.simulation.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.simulation.ui/META-INF/MANIFEST.MF
index fbc91ca09..7bada8706 100644
--- a/bundles/org.simantics.simulation.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.simulation.ui/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.core.services;bundle-version="2.0.0",
  org.eclipse.e4.ui.di,
  org.eclipse.e4.core.di.extensions;bundle-version="0.13.0"
+Import-Package: javax.inject
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.simantics.simulation.ui
diff --git a/bundles/org.simantics.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.ui/META-INF/MANIFEST.MF
index 5d7e5d810..2842b50b7 100644
--- a/bundles/org.simantics.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.ui/META-INF/MANIFEST.MF
@@ -32,6 +32,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.modeling.ontology;bundle-version="1.2.0",
  org.slf4j.api
 Bundle-ActivationPolicy: lazy
+Import-Package: javax.inject
 Export-Package: org.simantics.ui,
  org.simantics.ui.colors,
  org.simantics.ui.contribution,
diff --git a/bundles/org.simantics.workbench/META-INF/MANIFEST.MF b/bundles/org.simantics.workbench/META-INF/MANIFEST.MF
index 47e0c5c7e..968c1f344 100644
--- a/bundles/org.simantics.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.workbench/META-INF/MANIFEST.MF
@@ -44,6 +44,7 @@ Require-Bundle: com.ibm.icu,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.ui.services,
  org.slf4j.api;bundle-version="1.7.20"
+Import-Package: javax.inject
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .