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 811f14339ac2bd72a68ca9fa2476e864e35fb878
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Mon Aug 7 18:08:15 2023 +0200
Issue #325: Update dependencies
- Set the required execution environment in the OSGI headers to JavaSE-17
---
jVinci/pom.xml | 2 +-
uimaj-adapter-vinci/pom.xml | 2 +-
uimaj-core/pom.xml | 2 +-
uimaj-cpe/pom.xml | 2 +-
uimaj-ep-cas-editor-ide/pom.xml | 1 +
uimaj-ep-cas-editor/pom.xml | 22 ++++++++++++----------
uimaj-ep-configurator/pom.xml | 1 +
uimaj-ep-debug/pom.xml | 1 +
uimaj-ep-jcasgen/pom.xml | 1 +
uimaj-ep-launcher/pom.xml | 1 +
uimaj-ep-pear-packager/pom.xml | 1 +
uimaj-ep-runtime/pom.xml | 2 +-
uimaj-parent/pom.xml | 1 +
uimaj-tools/pom.xml | 2 +-
14 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/jVinci/pom.xml b/jVinci/pom.xml
index c0002bd1a..77edfeb2a 100644
--- a/jVinci/pom.xml
+++ b/jVinci/pom.xml
@@ -47,7 +47,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<_dsannotations>*</_dsannotations>
<_metatypeannotations>*</_metatypeannotations>
<Export-Package>
diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml
index 07affc91d..478d00de8 100644
--- a/uimaj-adapter-vinci/pom.xml
+++ b/uimaj-adapter-vinci/pom.xml
@@ -77,7 +77,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<_dsannotations>*</_dsannotations>
<_metatypeannotations>*</_metatypeannotations>
<Import-Package>
diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
index b03592da9..9a3d262bd 100644
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@ -272,7 +272,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<_dsannotations>*</_dsannotations>
<_metatypeannotations>*</_metatypeannotations>
<Import-Package>
diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
index 84acdd3a8..bee21cc1b 100644
--- a/uimaj-cpe/pom.xml
+++ b/uimaj-cpe/pom.xml
@@ -99,7 +99,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<_dsannotations>*</_dsannotations>
<_metatypeannotations>*</_metatypeannotations>
<Fragment-Host>org.apache.uima.j-core</Fragment-Host>
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index ae8d49ab4..f92b488ab 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -196,6 +196,7 @@
org.apache.uima.caseditor.editor.styleview,
*
</Import-Package>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
</execution>
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index c2da7ed43..116721a30 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -34,16 +34,6 @@
<url>${uimaWebsiteUrl}</url>
<dependencies>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
<!-- UIMA dependencies -->
<!--
don't depend on the runtime plugin, instead, depend on the parts
@@ -128,6 +118,17 @@
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -205,6 +206,7 @@
!org.osgi.framework,
*
</Import-Package>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
</execution>
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index 5bea7f23b..443dd138b 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -148,6 +148,7 @@
<Eclipse-AutoStart>true</Eclipse-AutoStart>
<Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
<Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml
index 884a049c7..62ef3a945 100644
--- a/uimaj-ep-debug/pom.xml
+++ b/uimaj-ep-debug/pom.xml
@@ -81,6 +81,7 @@ UIMA data structures to the Eclipse Debug
displays</description>
org.eclipse.ui.plugin
</Import-Package>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
index e961c1430..71f4a3b32 100644
--- a/uimaj-ep-jcasgen/pom.xml
+++ b/uimaj-ep-jcasgen/pom.xml
@@ -119,6 +119,7 @@
<Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
<Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml
index 3ea9b11d7..80fa8d3d5 100644
--- a/uimaj-ep-launcher/pom.xml
+++ b/uimaj-ep-launcher/pom.xml
@@ -84,6 +84,7 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<Export-Package>
org.apache.uima.ep_launcher
</Export-Package>
diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml
index 4ea0bbee9..a7342a7d0 100644
--- a/uimaj-ep-pear-packager/pom.xml
+++ b/uimaj-ep-pear-packager/pom.xml
@@ -120,6 +120,7 @@
<Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
<Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
</instructions>
</configuration>
</plugin>
diff --git a/uimaj-ep-runtime/pom.xml b/uimaj-ep-runtime/pom.xml
index 8382f95c9..1ecfa4b64 100644
--- a/uimaj-ep-runtime/pom.xml
+++ b/uimaj-ep-runtime/pom.xml
@@ -213,7 +213,7 @@
<!-- These just get made into the corresponding manifest
entries -->
<Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
<Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
</instructions>
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 67e26fb7c..b40c13668 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -158,6 +158,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.release>17</maven.compiler.release>
+ <execution.environment>JavaSE-17</execution.environment>
<eclipseP2RepoId>org.eclipse.p2.201812</eclipseP2RepoId>
diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml
index 2316c25b1..87c4b553d 100644
--- a/uimaj-tools/pom.xml
+++ b/uimaj-tools/pom.xml
@@ -98,7 +98,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+
<Bundle-RequiredExecutionEnvironment>${execution.environment}</Bundle-RequiredExecutionEnvironment>
<_dsannotations>*</_dsannotations>
<_metatypeannotations>*</_metatypeannotations>
<Import-Package>
