Skip to content

Commit

Permalink
remove versions for webjars from html files
Browse files Browse the repository at this point in the history
use webjars-locator to only update version of a webjar in your pom
  • Loading branch information
uniqueck committed Feb 15, 2019
1 parent e2c9bce commit d947317
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 30 deletions.
13 changes: 11 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
<thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.version>
<assertj.version>3.8.0</assertj.version>

<webjars.bootstrap.version>3.3.7</webjars.bootstrap.version>
<webjars.jquery.version>3.2.1</webjars.jquery.version>
</properties>

<!-- Add typical dependencies for a web application -->
Expand Down Expand Up @@ -74,13 +77,19 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>3.3.7</version>
<version>${webjars.bootstrap.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>3.2.1</version>
<version>${webjars.jquery.version}</version>
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-locator</artifactId>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/templates/fragments/alert.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"
<link href="/webjars/bootstrap/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"
rel="stylesheet" media="screen" />
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/js/bootstrap.min.js"
th:href="@{/webjars/bootstrap/3.3.7/js/bootstrap.min.js}"
<link href="/webjars/bootstrap/js/bootstrap.min.js"
th:href="@{/webjars/bootstrap/js/bootstrap.min.js}"
rel="stylesheet" media="screen" />
<script src="http://cdn.jsdelivr.net/webjars/jquery/3.2.1/jquery.min.js"
th:src="@{/webjars/jquery/3.2.1/jquery.min.js}"></script>
<script src="/webjars/jquery/jquery.min.js"
th:src="@{/webjars/jquery/jquery.min.js}"></script>
</head>
<body>
<div th:fragment="alert (type, message)" class="alert alert-dismissable" th:classappend="'alert-' + ${type}">
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/fragments/footer.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"
<link href="/webjars/bootstrap/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"
rel="stylesheet" media="screen" />
</head>
<body>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/templates/fragments/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html xmlns:th="http://www.thymeleaf.org">

<head>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"
<link href="/webjars/bootstrap/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"
rel="stylesheet" media="screen" />
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/js/bootstrap.min.js"
th:href="@{/webjars/bootstrap/3.3.7/js/bootstrap.min.js}"
<link href="/webjars/bootstrap/js/bootstrap.min.js"
th:href="@{/webjars/bootstrap/js/bootstrap.min.js}"
rel="stylesheet" media="screen" />
<script src="http://cdn.jsdelivr.net/webjars/jquery/3.2.1/jquery.min.js"
th:src="@{/webjars/jquery/3.2.1/jquery.min.js}"></script>
<script src="/webjars/jquery/jquery.min.js"
th:src="@{/webjars/jquery/jquery.min.js}"></script>
</head>
<body>

Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<head>
<title>Hello Spring Boot!</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"
<link href="/webjars/bootstrap/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"
rel="stylesheet" media="screen" />
<link href="../static/css/core.css"
th:href="@{/css/core.css}"
rel="stylesheet" media="screen" />
<script src="http://cdn.jsdelivr.net/webjars/jquery/3.2.1/jquery.min.js"
th:src="@{/webjars/jquery/3.2.1/jquery.min.js}"></script>
<script src="/webjars/jquery/jquery.min.js"
th:src="@{/webjars/jquery/jquery.min.js}"></script>
</head>
<body>
<!-- Header -->
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/templates/layouts/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<head>
<title>Hello Spring Boot!</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"
<link href="/webjars/bootstrap/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"
rel="stylesheet" media="screen" />
<link href="../../static/css/core.css"
th:href="@{/css/core.css}"
rel="stylesheet" media="screen" />
<script src="http://cdn.jsdelivr.net/webjars/jquery/3.2.1/jquery.min.js"
th:src="@{/webjars/jquery/3.2.1/jquery.min.js}"></script>
<script src="/webjars/jquery/jquery.min.js"
th:src="@{/webjars/jquery/jquery.min.js}"></script>
</head>
<body>
<!-- Header -->
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/th-form.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<head>
<title>Hello Spring Boot!</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css" th:href="@{/webjars/bootstrap/3.3.6/css/bootstrap.min.css}" rel="stylesheet" media="screen"/>
<link href="/webjars/bootstrap/css/bootstrap.min.css" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" rel="stylesheet" media="screen"/>
<link href="../static/css/core.css" th:href="@{/css/core.css}" rel="stylesheet" media="screen"/>
<script src="http://cdn.jsdelivr.net/webjars/jquery/3.2.1/jquery.min.js" th:src="@{/webjars/jquery/2.2.1/jquery.min.js}"></script>
<script src="/webjars/jquery/jquery.min.js" th:src="@{/webjars/jquery/jquery.min.js}"></script>
</head>
<body>
<!-- Insert content into the layouts/layout.html -->
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/templates/th-objects.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<head>
<title>Hello Spring Boot!</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.3.7/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"
<link href="/webjars/bootstrap/css/bootstrap.min.css"
th:href="@{/webjars/bootstrap/css/bootstrap.min.css}"
rel="stylesheet" media="screen" />
<link href="../static/css/core.css"
th:href="@{/css/core.css}"
rel="stylesheet" media="screen" />
<script src="http://cdn.jsdelivr.net/webjars/jquery/3.2.1/jquery.min.js"
th:src="@{/webjars/jquery/3.2.1/jquery.min.js}"></script>
<script src="/webjars/jquery/jquery.min.js"
th:src="@{/webjars/jquery/jquery.min.js}"></script>
</head>
<body>
<!-- Insert content into the layouts/layout.html -->
Expand Down

0 comments on commit d947317

Please sign in to comment.