Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Spring Framework 6.2.1 #167

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Bump to Spring Framework 6.2.1 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.samples</groupId>
<artifactId>spring-framework-petclinic</artifactId>
<version>6.1.10</version>
<version>6.2.1</version>

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

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

<!-- Jakarta EE / Java SE dependencies -->
<tomcat.version>10.1.30</tomcat.version>
<tomcat.version>10.1.34</tomcat.version>
<jaxb-api.version>4.0.2</jaxb-api.version>
<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
<jakarta-activation.version>2.1.3</jakarta-activation.version>
Expand All @@ -46,23 +46,23 @@
<jpa-api.version>3.1.0</jpa-api.version>

<!-- Persistence -->
<spring-data.version>2024.0.5</spring-data.version>
<hibernate.version>6.6.0.Final</hibernate.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<spring-data.version>2024.1.1</spring-data.version>
<hibernate.version>6.6.4.Final</hibernate.version>
<hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
<hsqldb.version>2.7.3</hsqldb.version>
<h2database.version>2.3.232</h2database.version>
<caffeine.version>3.1.8</caffeine.version>

<!-- Logging -->
<slf4j.version>2.0.16</slf4j.version>
<logback.version>1.5.6</logback.version>
<logback.version>1.5.15</logback.version>

<!-- Test -->
<assertj.version>3.25.3</assertj.version>
<assertj.version>3.27.0</assertj.version>
<json-path.version>2.9.0</json-path.version>
<mockito.version>5.14.2</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<junit-jupiter.version>5.11.4</junit-jupiter.version>

<!-- JDBC Drivers -->
<mysql-driver.version>8.1.0</mysql-driver.version>
Expand Down Expand Up @@ -502,6 +502,10 @@
<requireMavenVersion>
<version>3.8.4</version>
</requireMavenVersion>
<requireJavaVersion>
<message>This build requires at least Java ${java.version}, update your JVM, and run the build again</message>
<version>${java.version}</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Configure a Jetty or a Tomcat web container then deploy the `spring-petclinic.wa

3) Inside IntelliJ IDEA

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

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