[spring-extensions] 01/02: New major version: adopt Spring Framework 6, Jakarta Servlet 5
Ian Young
ian at iay.org.uk
Tue Mar 22 11:41:19 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch dev/JPAR-186
in repository spring-extensions.
View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=6816b72723b6e911ecac58d971d63a6497ef1a0b
commit 6816b72723b6e911ecac58d971d63a6497ef1a0b
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Dec 21 17:17:30 2021 +0000
New major version: adopt Spring Framework 6, Jakarta Servlet 5
---
pom.xml | 11 +++++------
.../context/FilesystemGenericWebApplicationContext.java | 4 ++--
.../shibboleth/ext/spring/error/ErrorRaisingController.java | 3 ++-
.../ext/spring/error/ExtendedMappingExceptionResolver.java | 8 ++++----
.../java/net/shibboleth/ext/spring/util/SpringSupport.java | 2 +-
.../shibboleth/ext/spring/velocity/VelocityConfigurer.java | 3 ++-
.../java/net/shibboleth/ext/spring/velocity/VelocityView.java | 6 +++---
7 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e8804b..0df50ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.2.2-SNAPSHOT</version>
+ <version>17.0.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.ext</groupId>
@@ -16,7 +16,7 @@
build (to populate the javadoc, which is consumed by the
Jenkins 'nightly' builds).
-->
- <version>6.2.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<name>Spring Framework Extension</name>
<description>
@@ -26,9 +26,8 @@
<properties>
<automatic.module.name>net.shibboleth.ext.spring</automatic.module.name>
- <java-support.version>8.3.0-SNAPSHOT</java-support.version>
+ <java-support.version>9.0.0-SNAPSHOT</java-support.version>
<shibboleth.site.deploy.url>//shibboleth.net/home/javasites/staging/</shibboleth.site.deploy.url>
- <jdk.version>15.3</jdk.version>
</properties>
<repositories>
@@ -131,8 +130,8 @@
<!-- Provided dependencies -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
<!-- Required for error handling classes. -->
<optional>true</optional>
diff --git a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java
index 2ce9fff..7ff90e4 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java
@@ -20,13 +20,13 @@ package net.shibboleth.ext.spring.context;
import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
-import javax.servlet.ServletContext;
-
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.web.context.support.GenericWebApplicationContext;
+import jakarta.servlet.ServletContext;
+
/**
* An extension of {@link GenericWebApplicationContext} that is biased in favor of the filesystem such that bare
* resource paths are assumed to be files rather than classpath resources, and supports conditional resources.
diff --git a/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java b/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java
index 415ee89..7030f5a 100644
--- a/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java
+++ b/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java
@@ -18,13 +18,14 @@
package net.shibboleth.ext.spring.error;
import javax.annotation.Nonnull;
-import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import jakarta.servlet.http.HttpServletRequest;
+
/**
* MVC controller for responding to errors by dispatching them to the MVC error handling umbrella.
*/
diff --git a/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java b/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
index 0855541..a30fa7a 100644
--- a/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
+++ b/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
@@ -22,10 +22,6 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.shibboleth.utilities.java.support.codec.HTMLEncoder;
import org.slf4j.LoggerFactory;
import org.springframework.web.context.WebApplicationContext;
@@ -33,6 +29,10 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.utilities.java.support.codec.HTMLEncoder;
+
/**
* Custom Spring exception to view mapper that populates the view model with data
* obtained via an extension function.
diff --git a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
index dfbff9b..3ffdd86 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
@@ -26,7 +26,6 @@ import java.util.Locale.LanguageRange;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
import javax.xml.namespace.QName;
import org.slf4j.Logger;
@@ -49,6 +48,7 @@ import org.xml.sax.InputSource;
import com.google.common.base.Strings;
+import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
diff --git a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
index c8c93cd..076f6df 100644
--- a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
+++ b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.ServletContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.VelocityException;
@@ -30,6 +29,8 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.web.context.ServletContextAware;
+import jakarta.servlet.ServletContext;
+
/**
* JavaBean to configure Velocity for web usage, via the "configLocation"
* and/or "velocityProperties" and/or "resourceLoaderPath" bean properties.
diff --git a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
index ade9683..195dd03 100644
--- a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
+++ b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
@@ -22,8 +22,6 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -31,7 +29,6 @@ import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ResourceNotFoundException;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -40,6 +37,9 @@ import org.springframework.core.NestedIOException;
import org.springframework.web.servlet.view.AbstractTemplateView;
import org.springframework.web.util.NestedServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
/**
* View using the Velocity template engine.
*
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list