Migrate to spengo library 2.0 and hence to Jakarta EE 10.

Silverpeas · Aug 23, 2023 · 067f022 · 067f022
1 parent 5f72882
commit 067f022
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,17 +10,16 @@
   <name>Silverpeas SPNEGO Filter Setup</name>
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>  
+    <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <undertow.version>2.2.24.Final</undertow.version>
+    <undertow.version>2.3.8.Final</undertow.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.silverpeas.spnego</groupId>
       <artifactId>silverpeas-spnego</artifactId>
-      <version>1.0</version>
+      <version>2.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -39,10 +38,21 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
+        <configuration>
+          <release>${maven.compiler.release}</release>
+          <encoding>UTF-8</encoding>
+          <forceJavacCompilerUse>true</forceJavacCompilerUse>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>3.0.1</version>
         <configuration>
           <localCheckout>true</localCheckout>
           <pushChanges>false</pushChanges>
@@ -54,6 +64,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>attach-sources</id>

diff --git a/src/main/java/org/silverpeas/spnego/SpnegoServletExtension.java b/src/main/java/org/silverpeas/spnego/SpnegoServletExtension.java
@@ -4,8 +4,8 @@
 import io.undertow.servlet.api.DeploymentInfo;
 import io.undertow.servlet.api.FilterInfo;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletContext;
 import java.util.StringTokenizer;
 
 /**