From af0bf496673bd8a4e35128a76f970dddec5d8261 Mon Sep 17 00:00:00 2001
From: Wim Deblauwe <wim.deblauwe@gmail.com>
Date: Wed, 18 Oct 2023 20:15:27 +0200
Subject: [PATCH] Use webjars-locator to avoid hardcoding versions of webjar
 dependencies in the layout file

---
 pom.xml                                            | 6 ++++++
 src/main/resources/templates/fragments/layout.html | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0627c18..ab86484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <!-- Web dependencies -->
+    <webjars-locator.version>0.46</webjars-locator.version>
     <webjars-bootstrap.version>5.2.3</webjars-bootstrap.version>
     <webjars-font-awesome.version>4.7.0</webjars-font-awesome.version>
     <htmx.org.version>1.9.5</htmx.org.version>
@@ -94,6 +95,11 @@
     </dependency>
 
     <!-- webjars -->
+    <dependency>
+      <groupId>org.webjars</groupId>
+      <artifactId>webjars-locator</artifactId>
+      <version>${webjars-locator.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.webjars.npm</groupId>
       <artifactId>bootstrap</artifactId>
diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html
index 039d806..e10a525 100755
--- a/src/main/resources/templates/fragments/layout.html
+++ b/src/main/resources/templates/fragments/layout.html
@@ -17,7 +17,7 @@
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-  <link th:href="@{/webjars/font-awesome/4.7.0/css/font-awesome.min.css}" rel="stylesheet">
+  <link th:href="@{/webjars/font-awesome/css/font-awesome.min.css}" rel="stylesheet">
   <link rel="stylesheet" th:href="@{/resources/css/petclinic.css}" />
 
 </head>
@@ -92,9 +92,9 @@
     </div>
   </div>
 
-  <script th:src="@{/webjars/bootstrap/5.2.3/dist/js/bootstrap.bundle.min.js}"></script>
-  <script th:src="@{/webjars/htmx.org/1.9.5/dist/htmx.min.js}"></script>
-  <script th:src="@{/webjars/hyperscript.org/0.9.8/dist/_hyperscript.min.js}"></script>
+  <script th:src="@{/webjars/bootstrap/dist/js/bootstrap.bundle.min.js}"></script>
+  <script th:src="@{/webjars/htmx.org/dist/htmx.min.js}"></script>
+  <script th:src="@{/webjars/hyperscript.org/dist/_hyperscript.min.js}"></script>
 
 </body>