diff --git a/spring-web-modules/spring-mvc-crash/pom.xml b/spring-web-modules/spring-mvc-crash/pom.xml index ce99fa7c2152..df5b49ed150f 100644 --- a/spring-web-modules/spring-mvc-crash/pom.xml +++ b/spring-web-modules/spring-mvc-crash/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-spring-5 + parent-spring-6 0.0.1-SNAPSHOT - ../../parent-spring-5 + ../../parent-spring-6 @@ -20,26 +20,18 @@ org.springframework spring-web - ${org.springframework.version} org.springframework spring-webmvc - ${org.springframework.version} - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} + jakarta.servlet + jakarta.servlet-api + ${jakarta-servlet.version} provided - - javax.servlet - jstl - ${jstl.version} - runtime - org.hibernate.validator hibernate-validator @@ -72,11 +64,6 @@ - - org.glassfish - javax.el - ${javax.el.version} - org.springframework.boot spring-boot-starter-test @@ -136,8 +123,7 @@ - 5.0.2.RELEASE - 1.5.10.RELEASE + 3.3.3 5.1.40 @@ -145,13 +131,13 @@ 4.5.2 8.0.1.Final - 3.0.1-b08 2.8.0 1.6.1 1.3.2 3.0.0-rc-3 + 6.1.0 \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-crash/src/main/java/com/baeldung/spring/controller/WelcomeController.java b/spring-web-modules/spring-mvc-crash/src/main/java/com/baeldung/spring/controller/WelcomeController.java index 526833611bff..5f7550fdcad2 100644 --- a/spring-web-modules/spring-mvc-crash/src/main/java/com/baeldung/spring/controller/WelcomeController.java +++ b/spring-web-modules/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;