Skip to content

Fix Bootstrap version mismatch causing 404 errors on /webjars/** endpoint #106

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Bootstrap version mismatch causing 404 errors on /webjars/** endpoint #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e773b
Update Bootstrap version from 5.2.3 to 5.3.2 to align with Gradle build
shaykeren Aug 5, 2025
784b89b
Update Bootstrap version from 5.2.3 to 5.3.2 in script tag
shaykeren Aug 5, 2025
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
97 changes: 95 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Important for reproducible builds. Update using e.g. ./mvnw versions:set -DnewVersion=... -->
<project.build.outputTimestamp>2023-05-10T07:42:50Z</project.reporting.outputEncoding>
<!-- Important for reproducible builds. Update using e.g. ./mvnw versions:set -DnewVersion=... -->
<project.build.outputTimestamp>2023-05-10T07:42:50Z</project.build.outputTimestamp>

<!-- Web dependencies -->
<webjars-bootstrap.version>5.2.3</webjars-bootstrap.version>
<webjars-bootstrap.version>5.3.2</webjars-bootstrap.version>
<webjars-font-awesome.version>4.7.0</webjars-font-awesome.version>

<checkstyle.version>10.11.0</checkstyle.version>
Expand All @@ -36,6 +38,13 @@

</properties>

<dependencies>
<!-- Spring and Spring Boot dependencies -->
<dependency>
<groupId>org.springframework.boot</otel.version>

</properties>

<dependencies>
<!-- Spring and Spring Boot dependencies -->
<dependency>
Expand All @@ -58,6 +67,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId></artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
Expand Down Expand Up @@ -85,6 +98,13 @@
<scope>runtime</scope>
</dependency>

<!-- caching -->
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId></artifactId>
<scope>runtime</scope>
</dependency>

<!-- caching -->
<dependency>
<groupId>javax.cache</groupId>
Expand Down Expand Up @@ -118,6 +138,11 @@
<artifactId>spring-boot-testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-docker-compose</artifactId>
Expand All @@ -139,6 +164,11 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>

<!-- OTEL deps, Enables instrumentation using @WithSpan-->
<dependency>
<groupId>io.opentelemetry.instrumentation</artifactId>
</dependency>

<!-- OTEL deps, Enables instrumentation using @WithSpan-->
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
Expand Down Expand Up @@ -168,6 +198,10 @@
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<type>pom</type>
<scope>import</scope></groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
Expand All @@ -193,6 +227,11 @@
</rules>
</configuration>
</execution>
</executions></version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand All @@ -216,6 +255,8 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version></groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
<dependency>
Expand All @@ -236,6 +277,8 @@
<configuration>
<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
<sourceDirectories>${basedir}</configLocation>
<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
<sourceDirectories>${basedir}</sourceDirectories>
<includes>**/*</includes>
<excludes>**/.git/**/*,**/.idea/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class</excludes>
Expand Down Expand Up @@ -281,6 +324,12 @@
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals></execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
Expand Down Expand Up @@ -312,6 +361,14 @@
</license>
</licenses>

<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>

<repositories>
<repository>
<id>spring-snapshots</id>
Expand Down Expand Up @@ -340,6 +397,12 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
Expand All @@ -366,6 +429,11 @@
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.webjars.npm</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
Expand All @@ -388,6 +456,9 @@
<execution>
<phase>generate-resources</phase>
<?m2e execute onConfiguration,onIncremental?>
<goals>
<goal>compile</phase>
<?m2e execute onConfiguration,onIncremental?>
<goals>
<goal>compile</goal>
</goals>
Expand All @@ -402,6 +473,15 @@
</plugins>
</build>
</profile>
<profile>
<id>m2e</id>
<activation>
<property>
<name>m2e.version</name>
</property></plugin>
</plugins>
</build>
</profile>
<profile>
<id>m2e</id>
<activation>
Expand All @@ -425,6 +505,8 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<versionRange>[1,)</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<versionRange>[1,)</versionRange>
<goals>
<goal>check</goal>
Expand All @@ -443,6 +525,10 @@
<goal>build-info</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action></goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
Expand All @@ -467,7 +553,14 @@
</plugins>
</pluginManagement>
</build>
</profile></pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>

</project>
</project>
22 changes: 7 additions & 15 deletions src/main/resources/templates/fragments/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,14 @@
<link th:href="@{/webjars/font-awesome/4.7.0/css/font-awesome.min.css}" rel="stylesheet">
<link rel="stylesheet" th:href="@{/resources/css/petclinic.css}" />

</head>

<body>
</head><body>

<nav class="navbar navbar-expand-lg navbar-dark" role="navigation">
<div class="container-fluid">
<a class="navbar-brand" th:href="@{/}"><span></span></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navbar">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="main-navbar" style>
</button><div class="collapse navbar-collapse" id="main-navbar" style>

<ul class="navbar-nav me-auto mb-2 mb-lg-0" th:remove="all">

Expand All @@ -53,9 +50,7 @@
<li th:replace="~{::menuItem ('/owners/find','owners','find owners','search','Find owners')}">
<span class="fa fa-search" aria-hidden="true"></span>
<span>Find owners</span>
</li>

<li th:replace="~{::menuItem ('/vets.html','vets','veterinarians','th-list','Veterinarians')}">
</li><li th:replace="~{::menuItem ('/vets.html','vets','veterinarians','th-list','Veterinarians')}">
<span class="fa fa-th-list" aria-hidden="true"></span>
<span>Veterinarians</span>
</li>
Expand All @@ -69,18 +64,15 @@
<li th:replace="~{::menuItem ('/clinic-activity/query-logs','activity','Clinic Activity Logs','bar-chart','Activity')}">
<span class="fa fa-bar-chart" aria-hidden="true"></span>
<span>Activity</span>
</li>

<li th:replace="~{::menuItem ('/patient-records/query-records','patient-records','Patient Records Query','heartbeat','Patient Records')}">
</li><li th:replace="~{::menuItem ('/patient-records/query-records','patient-records','Patient Records Query','heartbeat','Patient Records')}">
<span class="fa fa-heartbeat" aria-hidden="true"></span>
<span>Patient Records</span>
</li>

</ul>
</div>
</div>
</nav>
<div class="container-fluid">
</nav><div class="container-fluid">
<div class="container xd-container">

<th:block th:insert="${template}" />
Expand All @@ -97,8 +89,8 @@
</div>
</div>

<script th:src="@{/webjars/bootstrap/5.2.3/dist/js/bootstrap.bundle.min.js}"></script>
<script th:src="@{/webjars/bootstrap/5.3.2/dist/js/bootstrap.bundle.min.js}"></script>

</body>

</html>
</html>