[java-parent-project] 02/05: 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=865e18887a1ab5dc8fe462ab1f82bb80d6ca8b2c

commit 865e18887a1ab5dc8fe462ab1f82bb80d6ca8b2c
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 | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 916e3ea..9ff1fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,7 @@
 
     <groupId>net.shibboleth</groupId>
     <artifactId>parent</artifactId>
-<<<<<<< HEAD
-    <version>11.3.3-SNAPSHOT</version>
-=======
     <version>17.0.0-SNAPSHOT</version>
->>>>>>> 9024896 (Create new platform based on Java 17)
     <packaging>pom</packaging>
 
     <name>Shibboleth Project Java 17 Super POM</name>
@@ -71,7 +67,7 @@
         <slf4j.groupId>org.slf4j</slf4j.groupId>
         <slf4j.version>1.7.36</slf4j.version>
         <spring.groupId>org.springframework</spring.groupId>
-        <spring.version>5.3.19</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>
@@ -197,6 +193,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>
@@ -529,9 +535,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.