JAVA-39456-spring-mvc-crash-upgrade-from-spring-5-to-6 (eugenp#17617)

Co-authored-by: tienvn <[email protected]>
mfaisalkhatri · Oct 6, 2024 · 9902a83 · 9902a83
1 parent 8f081c9
commit 9902a83
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/spring-web-modules/spring-mvc-crash/pom.xml b/spring-web-modules/spring-mvc-crash/pom.xml
@@ -10,36 +10,28 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-spring-6</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-spring-5</relativePath>
+        <relativePath>../../parent-spring-6</relativePath>
     </parent>
 
     <dependencies>
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${org.springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
         </dependency>
         <!-- web -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -72,11 +64,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>${javax.el.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -136,22 +123,21 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-        <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
+        <spring-boot.version>3.3.3</spring-boot.version>
         <!-- persistence -->
         <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
         <!-- http -->
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
         <!-- various -->
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
-        <javax.el.version>3.0.1-b08</javax.el.version>
         <!-- util -->
         <geoip2.version>2.8.0</geoip2.version>
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <crash.version>1.3.2</crash.version>
         <groovy.version>3.0.0-rc-3</groovy.version>
+        <jakarta-servlet.version>6.1.0</jakarta-servlet.version>
     </properties>
 
 </project>
diff --git a/...ules/spring-mvc-crash/src/main/java/com/baeldung/spring/controller/WelcomeController.java b/...ules/spring-mvc-crash/src/main/java/com/baeldung/spring/controller/WelcomeController.java
@@ -1,8 +1,7 @@
 package com.baeldung.spring.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;