iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-26048 | upgraded spring-mvc-5 to spring-boot-3 (#15005)

Browse Source
This commit is contained in:
Gaetano Piazzolla 2023-10-21 10:46:20 +02:00 committed by GitHub
parent 106067388d
commit adb490c874
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-web-modules/spring-mvc-basics-5/pom.xml
View File

@ -10,9 +10,9 @@
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId> <artifactId>parent-boot-3</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2</relativePath> <relativePath>../../parent-boot-3</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -30,8 +30,14 @@
<artifactId>tomcat-embed-jasper</artifactId> <artifactId>tomcat-embed-jasper</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jakarta.servlet.jsp.jstl}</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>${jakarta.servlet.jsp.jstl}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -53,6 +59,11 @@
<artifactId>jaxb-runtime</artifactId> <artifactId>jaxb-runtime</artifactId>
<version>${jaxb-runtime.version}</version> <version>${jaxb-runtime.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>${io.rest-assured.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -73,6 +84,8 @@
<commons-io.version>1.3.2</commons-io.version> <commons-io.version>1.3.2</commons-io.version>
<json-path.version>2.7.0</json-path.version> <json-path.version>2.7.0</json-path.version>
<jaxb-runtime.version>2.3.5</jaxb-runtime.version> <jaxb-runtime.version>2.3.5</jaxb-runtime.version>
<jakarta.servlet.jsp.jstl>2.0.0</jakarta.servlet.jsp.jstl>
<io.rest-assured.version>3.0.0</io.rest-assured.version>
</properties> </properties>
</project> </project>

2
spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/jsonargs/JsonArgumentResolver.java
View File

@ -3,7 +3,7 @@ package com.baeldung.jsonargs;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;

2
spring-web-modules/spring-mvc-basics-5/src/main/java/com/baeldung/modelattribute/Employee.java
View File

@ -1,6 +1,6 @@
package com.baeldung.modelattribute; package com.baeldung.modelattribute;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
public class Employee { public class Employee {