Skip to content

Commit 7b7f8a8

Browse files
committed
GP-170 Upgrade to Spring 6
* upgrade to Spring 6 * upgrade to Jakarta Servlet API 6 * upgrade other libs * cleanup pom.xml files * remove empty modules * remove legacy view-resolver exercise
1 parent 591e3e0 commit 7b7f8a8

File tree

19 files changed

+25
-343
lines changed

19 files changed

+25
-343
lines changed

2-0-servlet-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>jakarta.servlet</groupId>
2222
<artifactId>jakarta.servlet-api</artifactId>
23-
<version>5.0.0</version>
23+
<version>6.0.0</version>
2424
<scope>provided</scope>
2525
</dependency>
2626
</dependencies>

3-0-spring-framework/3-0-0-hello-spring-framework/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
<artifactId>3-0-0-hello-spring-framework</artifactId>
1313

1414
<dependencies>
15-
<dependency>
16-
<groupId>org.springframework</groupId>
17-
<artifactId>spring-context</artifactId>
18-
<version>5.3.23</version>
19-
</dependency>
2015
<dependency>
2116
<groupId>com.bobocode</groupId>
2217
<artifactId>spring-framework-exercises-util</artifactId>

3-0-spring-framework/3-0-1-hello-spring-mvc/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
<dependency>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-web</artifactId>
18-
<version>2.7.3</version>
18+
<version>3.0.1</version>
1919
</dependency>
2020

2121
<dependency>
2222
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter-test</artifactId>
24-
<version>2.7.3</version>
24+
<version>3.0.1</version>
2525
<scope>test</scope>
2626
</dependency>
2727

2828
<dependency>
2929
<groupId>org.springframework.boot</groupId>
3030
<artifactId>spring-boot-starter-thymeleaf</artifactId>
31-
<version>2.7.3</version>
31+
<version>3.0.1</version>
3232
</dependency>
3333

3434
</dependencies>

3-0-spring-framework/3-0-2-view-resolver/pom.xml

-53
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/main/java/com/bobocode/ViewResolverApp.java

-6
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/main/java/com/bobocode/config/DispatcherServletConfig.java

-20
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/main/java/com/bobocode/config/ResolverConfig.java

-4
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/main/java/com/bobocode/controller/HelloJspController.java

-4
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/main/webapp/WEB-INF/views/index.jsp

-5
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/test/java/com/bobocode/HelloJspControllerTest.java

-88
This file was deleted.

3-0-spring-framework/3-0-2-view-resolver/src/test/java/com/bobocode/ViewResolverTest.java

-87
This file was deleted.

3-0-spring-framework/3-1-1-dispatcher-servlet-initializer/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<dependencies>
1616
<dependency>
17-
<groupId>javax.servlet</groupId>
18-
<artifactId>javax.servlet-api</artifactId>
19-
<version>4.0.1</version>
17+
<groupId>jakarta.servlet</groupId>
18+
<artifactId>jakarta.servlet-api</artifactId>
19+
<version>6.0.0</version>
2020
<scope>provided</scope>
2121
</dependency>
2222
<dependency>

3-0-spring-framework/3-2-1-account-rest-api/pom.xml

+5-10
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414

1515
<dependencies>
1616
<dependency>
17-
<groupId>javax.servlet</groupId>
18-
<artifactId>javax.servlet-api</artifactId>
19-
<version>4.0.1</version>
20-
<scope>provided</scope>
17+
<groupId>jakarta.servlet</groupId>
18+
<artifactId>jakarta.servlet-api</artifactId>
19+
<version>6.0.0</version>
2120
</dependency>
2221
<dependency>
2322
<groupId>com.bobocode</groupId>
@@ -27,13 +26,13 @@
2726
<dependency>
2827
<groupId>com.jayway.jsonpath</groupId>
2928
<artifactId>json-path</artifactId>
30-
<version>2.3.0</version>
29+
<version>2.7.0</version>
3130
<scope>test</scope>
3231
</dependency>
3332
<dependency>
3433
<groupId>com.jayway.jsonpath</groupId>
3534
<artifactId>json-path-assert</artifactId>
36-
<version>2.3.0</version>
35+
<version>2.7.0</version>
3736
<scope>test</scope>
3837
</dependency>
3938
</dependencies>
@@ -45,11 +44,7 @@
4544
<groupId>org.apache.maven.plugins</groupId>
4645
<artifactId>maven-war-plugin</artifactId>
4746
<version>3.3.2</version>
48-
<configuration>
49-
<failOnMissingWebXml>false</failOnMissingWebXml>
50-
</configuration>
5147
</plugin>
52-
5348
</plugins>
5449
</build>
5550

3-0-spring-framework/3-3-0-enable-string-trimming/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>3-3-0-enable-string-trimming</artifactId>
13-
<packaging>war</packaging>
1413
</project>

0 commit comments

Comments
 (0)