[java-parent-project] 02/04: Adopt Spring Framework 6, Jakarta Servlet 5

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch dev/JPAR-186
in repository java-parent-project.

View the commit online:
http://git.shibboleth.net/view/?p=java-parent-project.git;a=commit;h=1df42388b1ffae13cf6e5c86208499510e5a512d

commit 1df42388b1ffae13cf6e5c86208499510e5a512d
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Dec 21 17:15:40 2021 +0000

    Adopt Spring Framework 6, Jakarta Servlet 5
---
 pom.xml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4117ef0..fe389b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,7 @@
         <rhino.engine.version>1.0.0</rhino.engine.version> <!-- Test only dependency -->
         <slf4j.groupId>org.slf4j</slf4j.groupId>
         <slf4j.version>1.7.36</slf4j.version>
-        <spring.groupId>org.springframework</spring.groupId>
-        <spring.version>5.3.17</spring.version>
+        <spring.version>6.0.0-M1</spring.version>
         <spring-webflow.groupId>org.springframework.webflow</spring-webflow.groupId>
         <spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
         <velocity.version>2.3</velocity.version>
@@ -82,7 +81,7 @@
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+        <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
         <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
         <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
         <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
@@ -189,6 +188,16 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>spring-milestone</id>
+            <url>https://repo.spring.io/milestone</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -514,9 +523,9 @@
                 <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>5.0.0</version>
                 <scope>provided</scope>
             </dependency>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.