Remove strict requirement to bundle javax.inject

eclipse-emf-parsley · Nov 12, 2023 · c1bb2bf · c1bb2bf
1 parent e947878
commit c1bb2bf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF
@@ -13,10 +13,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.di,
- javax.annotation,
  org.eclipse.equinox.event
-Import-Package: org.apache.log4j,
- org.apache.commons.logging
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)",
+ org.apache.commons.logging,
+ org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.parsley.examples.eclipse4.parsleypart
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF
@@ -3,8 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Eclipse4
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.eclipse4;singleton:=true
 Bundle-Version: 1.14.0.qualifier
-Require-Bundle: javax.inject,
- org.eclipse.core.runtime,
+Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
+ javax.inject;version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swt,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.jface,
@@ -18,7 +19,6 @@ Require-Bundle: javax.inject,
  org.eclipse.core.resources,
  org.eclipse.emf.common,
  org.eclipse.emf.edit,
- org.eclipse.emf.parsley,
- javax.annotation
+ org.eclipse.emf.parsley
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.emf.parsley.examples.eclipse4
diff --git a/plugins/org.eclipse.emf.parsley.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.common/META-INF/MANIFEST.MF
@@ -38,7 +38,8 @@ Export-Package: org.eclipse.emf.parsley,
  org.eclipse.emf.parsley.validation,
  org.eclipse.emf.parsley.viewers,
  org.eclipse.emf.parsley.widgets
-Import-Package: org.apache.log4j;version="1.2.13",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
+ org.apache.log4j;version="1.2.13",
  org.eclipse.emf.common.ui,
  org.eclipse.emf.common.ui.action,
  org.eclipse.emf.common.ui.celleditor,

diff --git a/plugins/org.eclipse.emf.parsley.runtime.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.runtime.common/META-INF/MANIFEST.MF
@@ -6,12 +6,12 @@ Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.inject;visibility:=reexport,
- javax.inject;visibility:=reexport,
  com.google.guava;visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.common;bundle-version="2.7.0",
  org.eclipse.emf.ecore;bundle-version="2.9.0"
-Import-Package: org.apache.log4j;version="1.2.13",
+Import-Package: javax.inject;version="[1.0.0,2.0.0)",
+ org.apache.log4j;version="1.2.13",
  org.eclipse.jface.dialogs,
  org.eclipse.jface.resource,
  org.eclipse.swt.graphics,

diff --git a/plugins/org.eclipse.emf.parsley.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.runtime/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.inject;visibility:=reexport,
- javax.inject;visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.common;bundle-version="2.7.0",
  org.eclipse.ui;bundle-version="3.5.0",

diff --git a/...clipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AdapterFactoryHelperTest.xtend b/...clipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AdapterFactoryHelperTest.xtend
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.parsley.tests
 
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.emf.parsley.edit.provider.AdapterFactoryHelper
 import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest

diff --git a/...mf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerCellEditorFactoryTest.xtend b/...mf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerCellEditorFactoryTest.xtend
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.emf.parsley.tests
 
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.emf.common.ui.celleditor.ExtendedComboBoxCellEditor
 import org.eclipse.emf.ecore.EStructuralFeature
 import org.eclipse.emf.edit.ui.provider.PropertyDescriptor.EDataTypeCellEditor

diff --git a/...e.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerEditingSupportTest.xtend b/...e.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerEditingSupportTest.xtend
@@ -11,7 +11,7 @@
 package org.eclipse.emf.parsley.tests
 
 import com.google.inject.MembersInjector
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EStructuralFeature
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain