Skip to content

Commit

Permalink
Import package javax.inject instead of requiring bundle javax.inject
Browse files Browse the repository at this point in the history
This allows the OSGi runtime and the Eclipse SimRel to use other
providers of the 'javax.inject' package. In this case for example the
jakarta-bundles providing it too.
  • Loading branch information
HannesWell authored and zulus committed Nov 13, 2023
1 parent ca9b8c2 commit 47a1721
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.logging,
org.eclipse.php.composer.api,
org.eclipse.wst.validation,
org.eclipse.e4.core.di.annotations,
javax.inject
org.eclipse.e4.core.di.annotations
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Export-Package:
Expand All @@ -38,5 +37,6 @@ Export-Package:
org.eclipse.php.composer.core.visitor,
org.eclipse.php.composer.internal.core.resources,
org.eclipse.php.composer.internal.core.util
Import-Package: javax.inject;version="[1.0.0,2.0.0)"


2 changes: 1 addition & 1 deletion plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Require-Bundle: org.eclipse.ui.forms,
org.eclipse.tm.terminal.view.ui,
org.eclipse.tm.terminal.connector.process,
org.eclipse.tm.terminal.control,
javax.inject,
org.eclipse.ui.genericeditor,
org.eclipse.ui.editors
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand All @@ -62,4 +61,5 @@ Export-Package:
org.eclipse.php.composer.ui.wizard.importer,
org.eclipse.php.composer.ui.wizard.project,
org.eclipse.php.composer.ui.wizard.project.template
Import-Package: javax.inject;version="[1.0.0,2.0.0)"
Bundle-ClassPath: .

0 comments on commit 47a1721

Please sign in to comment.