[sis] 02/02: Upgrade JavaEE (now JakartaEE) and OSGi dependencies. They are used in incubated modules only, not released. JakartaEE is narrowed to the servlet API part only.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit f5390fda93ec9cac713924a1b83d8037ad0e4caf
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jul 14 14:25:50 2023 +0200

    Upgrade JavaEE (now JakartaEE) and OSGi dependencies.
    They are used in incubated modules only, not released.
    JakartaEE is narrowed to the servlet API part only.
---
 application/sis-webapp/pom.xml                                 | 10 +++++-----
 .../src/main/java/org/apache/sis/services/ServletListener.java |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/sis-webapp/pom.xml b/application/sis-webapp/pom.xml
index f39fd38c38..128a078d70 100644
--- a/application/sis-webapp/pom.xml
+++ b/application/sis-webapp/pom.xml
@@ -39,17 +39,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>8.0.1</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- Optional dependencies -->
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>6.0.0</version>
+      <artifactId>osgi.core</artifactId>
+      <version>8.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git 
a/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
 
b/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
index 461a35b0ff..f85cbcf5a3 100644
--- 
a/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
+++ 
b/application/sis-webapp/src/main/java/org/apache/sis/services/ServletListener.java
@@ -16,9 +16,9 @@
  */
 package org.apache.sis.services;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 import org.apache.sis.internal.system.Shutdown;