diff --git a/pom.xml b/pom.xml
index 85b4161..0cf7d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.codelibs
spnego
- 1.1.2-SNAPSHOT
+ 1.2.0-SNAPSHOT
jar
Integrated Windows Authentication (Single Sign-On) in Java.
2011
@@ -27,23 +27,20 @@
UTF-8
- 1.8
- 1.8
maven-compiler-plugin
- 3.8.1
+ 3.11.0
-
- ${maven.compiler.target}
+ 11
UTF-8
maven-source-plugin
- 3.1.0
+ 3.3.0
attach-sources
@@ -55,9 +52,8 @@
maven-javadoc-plugin
- 3.2.0
+ 3.6.2
-
UTF-8
UTF-8
UTF-8
@@ -65,7 +61,7 @@
maven-jar-plugin
- 3.2.2
+ 3.3.0
@@ -80,26 +76,26 @@
com.sun.xml.ws
jaxws-ri
- 2.3.2
+ 4.0.2
pom
provided
- javax.servlet
- javax.servlet-api
- 3.1.0
+ jakarta.servlet
+ jakarta.servlet-api
+ 6.0.0
provided
junit
junit
- 4.13.1
+ 4.13.2
test
org.dbflute.utflute
utflute-core
- 0.8.7
+ 1.5.1
test
diff --git a/src/main/java/org/codelibs/spnego/DelegateServletRequest.java b/src/main/java/org/codelibs/spnego/DelegateServletRequest.java
index 8eafae4..c513085 100644
--- 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
index f5bc008..1c3427c 100644
--- a/src/main/java/org/codelibs/spnego/SpnegoAuthenticator.java
+++ b/src/main/java/org/codelibs/spnego/SpnegoAuthenticator.java
@@ -34,10 +34,6 @@
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;
@@ -45,6 +41,11 @@
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 SPNEGO or Basic
diff --git a/src/main/java/org/codelibs/spnego/SpnegoFilterConfig.java b/src/main/java/org/codelibs/spnego/SpnegoFilterConfig.java
index 85f4609..662ad8a 100644
--- 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
index 8999c8d..6369f07 100644
--- 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 SPNEGO authentication.
diff --git a/src/main/java/org/codelibs/spnego/SpnegoHttpServletRequest.java b/src/main/java/org/codelibs/spnego/SpnegoHttpServletRequest.java
index 7e653eb..b787214 100644
--- 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
index c0c82da..07553a2 100644
--- 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
index c5de175..c47d502 100644
--- 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
index 54e794d..23bfcb1 100644
--- 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.
*