GH-5076: Port server-spring code to spring6

Author: fkleedorfer

tools/pom.xml

@@ -16,7 +16,7 @@
 		<module>federation</module>
 		<module>server</module>
 		<module>server-spring</module>
-        <module>server-spring6</module>
+		<module>server-spring6</module>
 		<module>workbench</module>
 		<module>runtime</module>
 		<module>runtime-osgi</module>

tools/server-spring6/pom.xml

@@ -9,6 +9,15 @@
 	<artifactId>rdf4j-http-server-spring6</artifactId>
 	<name>RDF4J: HTTP server - core (Spring 6)</name>
 	<description>HTTP server implementing a REST-style protocol</description>
+	<properties>
+		<!-- spring 6 requires java 17, compile these modules accordingly -->
+		<java.version>17</java.version>
+		<!-- override properties to match versions for spring 6 -->
+		<spring.version>6.2.12</spring.version>
+		<slf4j.version>2.0.17</slf4j.version>
+		<logback.version>1.5.20</logback.version>
+		<log4j.version>2.24.3</log4j.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -33,8 +42,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>6.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/CommonValuesHandlerInterceptor.java

@@ -12,12 +12,12 @@
 
 import java.util.Calendar;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Interceptor that inserts some commonly used values into the model. The inserted values are: - path, equal to
  * request.getContextPath() (e.g. /context) - basePath, equal to the fully qualified context path (e.g.

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/MessageHandlerInterceptor.java

@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
 /**
  * Interceptor that inserts some commonly used values into the model. The inserted values are: - path, equal to
  * request.getContextPath() (e.g. /context) - basePath, equal to the fully qualified context path (e.g.

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/filters/PathFilter.java

@@ -14,15 +14,15 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-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 javax.servlet.http.HttpServletResponseWrapper;
+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;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 /**
  * @author Herko ter Horst

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/navigation/NavigationHandlerInterceptor.java

@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.common.webapp.navigation;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
 /**
  * Interceptor that inserts the navigation model for the current Spring view into the model.
  *

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/system/SystemInfoController.java

@@ -18,13 +18,13 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SystemInfoController implements Controller {
 
 	private String view;

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/system/SystemOverviewController.java

@@ -13,13 +13,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SystemOverviewController implements Controller {
 
 	private String view;

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/system/logging/LoggingOverviewController.java

@@ -17,15 +17,15 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.AppConfiguration;
 import org.eclipse.rdf4j.common.logging.LogLevel;
 import org.eclipse.rdf4j.common.logging.LogReader;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class LoggingOverviewController implements Controller {
 
 	private AppConfiguration config;

tools/server-spring6/src/main/java/org/eclipse/rdf4j/common/webapp/system/proxy/ProxySettingsController.java

@@ -13,11 +13,11 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.rdf4j.common.app.net.ProxySettings;
 import org.eclipse.rdf4j.common.webapp.util.HttpServerUtil;
 
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * @author Herko ter Horst
  */