replace with jakarta package

codelibs · Dec 18, 2023 · b7e8082 · b7e8082
1 parent dc8cdf1
commit b7e8082
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codelibs</groupId>
 	<artifactId>spnego</artifactId>
-	<version>1.1.2-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<description>Integrated Windows Authentication (Single Sign-On) in Java.</description>
 	<inceptionYear>2011</inceptionYear>
@@ -27,23 +27,20 @@
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.11.0</version>
 				<configuration>
-					<source>${maven.compiler.source}</source>
-					<target>${maven.compiler.target}</target>
+					<release>11</release>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -55,17 +52,16 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.6.2</version>
 				<configuration>
-					<source>8</source>
 					<encoding>UTF-8</encoding>
 					<docencoding>UTF-8</docencoding>
 					<charset>UTF-8</charset>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.2</version>
+				<version>3.3.0</version>
 				<configuration>
 					<archive>
 						<manifestEntries>
@@ -80,26 +76,26 @@
 		<dependency>
 			<groupId>com.sun.xml.ws</groupId>
 			<artifactId>jaxws-ri</artifactId>
-			<version>2.3.2</version>
+			<version>4.0.2</version>
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>6.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.dbflute.utflute</groupId>
 			<artifactId>utflute-core</artifactId>
-			<version>0.8.7</version>
+			<version>1.5.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/org/codelibs/spnego/DelegateServletRequest.java b/src/main/java/org/codelibs/spnego/DelegateServletRequest.java
@@ -18,10 +18,10 @@
 
 package org.codelibs.spnego;
 
-import javax.servlet.ServletRequest;
-
 import org.ietf.jgss.GSSCredential;
 
+import jakarta.servlet.ServletRequest;
+
 /**
  * The default installation of Internet Explorer and Active Directory 
  * allow the user's/requester's credential to be delegated.

diff --git a/src/main/java/org/codelibs/spnego/SpnegoAuthenticator.java b/src/main/java/org/codelibs/spnego/SpnegoAuthenticator.java
@@ -34,17 +34,18 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.codelibs.spnego.SpnegoHttpFilter.Constants;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
 
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Handles <a href="http://en.wikipedia.org/wiki/SPNEGO">SPNEGO</a> or <a
  * href="http://en.wikipedia.org/wiki/Basic_access_authentication">Basic</a>

diff --git a/src/main/java/org/codelibs/spnego/SpnegoFilterConfig.java b/src/main/java/org/codelibs/spnego/SpnegoFilterConfig.java
@@ -31,10 +31,11 @@
 
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
-import javax.servlet.FilterConfig;
 
 import org.codelibs.spnego.SpnegoHttpFilter.Constants;
 
+import jakarta.servlet.FilterConfig;
+
 /**
  * Class that applies/enforces web.xml init params.
  * 

diff --git a/src/main/java/org/codelibs/spnego/SpnegoHttpFilter.java b/src/main/java/org/codelibs/spnego/SpnegoHttpFilter.java
@@ -29,17 +29,18 @@
 import java.util.logging.Logger;
 
 import javax.security.auth.login.LoginException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.ietf.jgss.GSSException;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Http Servlet Filter that provides <a
  * href="http://en.wikipedia.org/wiki/SPNEGO" target="_blank">SPNEGO</a> authentication.

diff --git a/src/main/java/org/codelibs/spnego/SpnegoHttpServletRequest.java b/src/main/java/org/codelibs/spnego/SpnegoHttpServletRequest.java
@@ -20,12 +20,12 @@
 
 import java.security.Principal;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
 import org.codelibs.spnego.SpnegoHttpFilter.Constants;
 import org.ietf.jgss.GSSCredential;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+
 /**
  * Wrap ServletRequest so we can do our own handling of the 
  * principal and auth types.

diff --git a/src/main/java/org/codelibs/spnego/SpnegoHttpServletResponse.java b/src/main/java/org/codelibs/spnego/SpnegoHttpServletResponse.java
@@ -20,8 +20,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 /**
  * Class adds capability to track/determine if the HTTP Status 

diff --git a/src/main/java/org/codelibs/spnego/SpnegoProvider.java b/src/main/java/org/codelibs/spnego/SpnegoProvider.java
@@ -29,8 +29,6 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.codelibs.spnego.SpnegoHttpFilter.Constants;
 import org.ietf.jgss.GSSContext;
@@ -40,6 +38,9 @@
 import org.ietf.jgss.GSSName;
 import org.ietf.jgss.Oid;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * This is a Utility Class that can be used for finer grained control 
  * over message integrity, confidentiality and mutual authentication.

diff --git a/src/main/java/org/codelibs/spnego/SpnegoSOAPConnection.java b/src/main/java/org/codelibs/spnego/SpnegoSOAPConnection.java
@@ -30,12 +30,6 @@
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
@@ -52,6 +46,12 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.MimeHeaders;
+import jakarta.xml.soap.SOAPConnection;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
+
 /**
  * This class can be used to make SOAP calls to a protected SOAP Web Service.
  *