Fix Tomcat 10.0 deployment + bump to Spring Framework 6.0.8

spring-petclinic · May 3, 2023 · 6a8b6f1 · 6a8b6f1
1 parent 970985f
commit 6a8b6f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-framework-petclinic</artifactId>
-    <version>6.0.5</version>
+    <version>6.0.8</version>
 
     <name>Spring Framework Petclinic</name>
     <packaging>war</packaging>
@@ -23,7 +23,7 @@
         <!-- Spring -->
         <!-- For framework compatibility, refer to the Spring Boot Dependencies BOM -->
         <!-- https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-dependencies/build.gradle -->
-        <spring-framework.version>6.0.5</spring-framework.version>
+        <spring-framework.version>6.0.8</spring-framework.version>
 
         <!-- Web dependencies -->
         <webjars-bootstrap.version>5.1.3</webjars-bootstrap.version>
@@ -120,8 +120,14 @@
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
             <version>${jstl-api.version}</version>
-            <scope>provided</scope>
         </dependency>
+        <!-- Tomcat 10 looks like to require it -->
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>${jstl-api.version}</version>
+        </dependency>
+
         <!--  Json -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/main/webapp/WEB-INF/tags/htmlHeader.tag b/src/main/webapp/WEB-INF/tags/htmlHeader.tag
@@ -17,8 +17,8 @@ PetClinic :: a Spring Framework demonstration
     <title>PetClinic :: a Spring Framework demonstration</title>
 
     <%-- CSS generated from SCSS --%>
-    <link href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-    <link href="/resources/css/petclinic.css" rel="stylesheet"/>
+    <link href="${pageContext.request.contextPath}/webjars/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="${pageContext.request.contextPath}/resources/css/petclinic.css" rel="stylesheet"/>
 
     <%-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --%>
     <!--[if lt IE 9]>