This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit bbedbe78dfee11ab5a1e287c8d316037606f12d2
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Mon Oct 16 15:05:32 2023 +0200
Issue #325: Update dependencies
- Fix package imports in Eclipse plugins
---
uimaj-ep-cas-editor-ide/pom.xml | 13 +++++++++++++
uimaj-ep-cas-editor/pom.xml | 14 ++++++++++++++
uimaj-ep-configurator/pom.xml | 11 +++++++++++
uimaj-ep-debug/pom.xml | 9 +++++++++
uimaj-ep-jcasgen/pom.xml | 12 +++++++++---
uimaj-ep-launcher/pom.xml | 11 +++++++++++
uimaj-ep-pear-packager/pom.xml | 12 ++++++++++++
7 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index dc4b9c903..17855ab36 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -158,6 +158,19 @@
<Bundle-Activator>org.apache.uima.caseditor.ide.CasEditorIdePlugin</Bundle-Activator>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.ui;ui.workbench=!,
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.model;ui.workbench=!,
+ org.eclipse.ui.part;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</execution>
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index f28ca7c20..67a09b478 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -201,6 +201,20 @@
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.ui;ui.workbench=!,
+ org.eclipse.ui.actions;ui.workbench=!,
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.part;ui.workbench=!,
+ org.eclipse.ui.texteditor;texteditor=!,
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</execution>
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index b44ff543f..46d95dcf3 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -186,6 +186,17 @@
<Require-Bundle>
org.eclipse.ui.ide
</Require-Bundle>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.ui.texteditor;texteditor=!,
+ org.eclipse.ui.part;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml
index 1fc50fcb2..945cd705f 100644
--- a/uimaj-ep-debug/pom.xml
+++ b/uimaj-ep-debug/pom.xml
@@ -79,6 +79,15 @@ UIMA data structures to the Eclipse Debug
displays</description>
<Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
index 663cea590..9c1676f3e 100644
--- a/uimaj-ep-jcasgen/pom.xml
+++ b/uimaj-ep-jcasgen/pom.xml
@@ -98,9 +98,15 @@
<Bundle-Activator>org.apache.uima.jcas.jcasgenp.JgPlugin</Bundle-Activator>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
- <Require-Bundle>
- org.eclipse.core.runtime
- </Require-Bundle>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml
index b62f3bc17..cd4fafff7 100644
--- a/uimaj-ep-launcher/pom.xml
+++ b/uimaj-ep-launcher/pom.xml
@@ -131,6 +131,17 @@
<Export-Package>
org.apache.uima.ep_launcher
</Export-Package>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.model;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml
index 0bd52dda4..7df10cad5 100644
--- a/uimaj-ep-pear-packager/pom.xml
+++ b/uimaj-ep-pear-packager/pom.xml
@@ -103,6 +103,18 @@
<Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <!--
+ - Need to enforce not having the "common" attribute here,
otherwise we get wired to the wrong bundle
+ - ("org.eclipse.equinox.common" instead of
"org.eclipse.core.runtime").
+ - Cf. https://bnd.bndtools.org/heads/import_package.html
+ -->
+ <Import-Package>
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.model;ui.workbench=!,
+ org.eclipse.ui;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
