Skip to content

Commit 4ebbf5e

Browse files
authored
Merge pull request #167 from arey/feature/spring-framework-6.2
Bump to Spring Framework 6.2.1
2 parents a214098 + 05facf3 commit 4ebbf5e

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

pom.xml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.springframework.samples</groupId>
66
<artifactId>spring-framework-petclinic</artifactId>
7-
<version>6.1.10</version>
7+
<version>6.2.1</version>
88

99
<name>Spring Framework Petclinic</name>
1010
<packaging>war</packaging>
@@ -28,15 +28,15 @@
2828
<!-- For framework compatibility, refer to the Spring Boot Dependencies BOM and to the gradle.properties -->
2929
<!-- https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-dependencies/build.gradle -->
3030
<!-- https://github.com/spring-projects/spring-boot/blob/main/gradle.properties -->
31-
<spring-framework.version>6.1.14</spring-framework.version>
31+
<spring-framework.version>6.2.1</spring-framework.version>
3232

3333
<!-- Web dependencies -->
3434
<webjars-bootstrap.version>5.3.3</webjars-bootstrap.version> <!-- Report bootstrap version to the footer.tag -->
3535
<webjars-font-awesome.version>4.7.0</webjars-font-awesome.version>
3636
<webjars-flatpickr.version>4.6.13</webjars-flatpickr.version>
3737

3838
<!-- Jakarta EE / Java SE dependencies -->
39-
<tomcat.version>10.1.30</tomcat.version>
39+
<tomcat.version>10.1.34</tomcat.version>
4040
<jaxb-api.version>4.0.2</jaxb-api.version>
4141
<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
4242
<jakarta-activation.version>2.1.3</jakarta-activation.version>
@@ -46,23 +46,23 @@
4646
<jpa-api.version>3.1.0</jpa-api.version>
4747

4848
<!-- Persistence -->
49-
<spring-data.version>2024.0.5</spring-data.version>
50-
<hibernate.version>6.6.0.Final</hibernate.version>
51-
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
49+
<spring-data.version>2024.1.1</spring-data.version>
50+
<hibernate.version>6.6.4.Final</hibernate.version>
51+
<hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
5252
<hsqldb.version>2.7.3</hsqldb.version>
5353
<h2database.version>2.3.232</h2database.version>
5454
<caffeine.version>3.1.8</caffeine.version>
5555

5656
<!-- Logging -->
5757
<slf4j.version>2.0.16</slf4j.version>
58-
<logback.version>1.5.6</logback.version>
58+
<logback.version>1.5.15</logback.version>
5959

6060
<!-- Test -->
61-
<assertj.version>3.25.3</assertj.version>
61+
<assertj.version>3.27.0</assertj.version>
6262
<json-path.version>2.9.0</json-path.version>
6363
<mockito.version>5.14.2</mockito.version>
6464
<hamcrest.version>2.2</hamcrest.version>
65-
<junit-jupiter.version>5.11.3</junit-jupiter.version>
65+
<junit-jupiter.version>5.11.4</junit-jupiter.version>
6666

6767
<!-- JDBC Drivers -->
6868
<mysql-driver.version>8.1.0</mysql-driver.version>
@@ -502,6 +502,10 @@
502502
<requireMavenVersion>
503503
<version>3.8.4</version>
504504
</requireMavenVersion>
505+
<requireJavaVersion>
506+
<message>This build requires at least Java ${java.version}, update your JVM, and run the build again</message>
507+
<version>${java.version}</version>
508+
</requireJavaVersion>
505509
</rules>
506510
</configuration>
507511
</execution>

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Configure a Jetty or a Tomcat web container then deploy the `spring-petclinic.wa
139139

140140
3) Inside IntelliJ IDEA
141141

142-
In the main menu, select `File > Open` and select the Petclinic [pom.xml](pom.xml). Click on the `Open` button.
142+
In the main menu, select `File > Open` and select the Petclinic [pom.xml](pom.xml). Click on the `Open` button.
143143

144144
CSS files are generated from the Maven build. You can either build them on the command line `./mvnw generate-resources`
145145
or right click on the `spring-petclinic` project then `Maven -> Generates sources and Update Folders`.

0 commit comments

Comments
 (0)