From 9133e337e60870477306c669ccefa057f7579cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedran=20Pavi=C4=87?= <vedran.pavic@gmail.com>
Date: Mon, 15 Aug 2016 20:25:53 +0200
Subject: [PATCH] Use webjars-locator in samples (#587)

---
 gradle.properties                                      |  1 +
 samples/boot/build.gradle                              |  1 +
 samples/boot/src/main/resources/templates/layout.html  |  6 +++---
 samples/custom-cookie/build.gradle                     |  5 +++++
 samples/custom-cookie/src/main/webapp/index.jsp        |  3 ++-
 samples/findbyusername/build.gradle                    |  1 +
 .../src/main/resources/templates/layout.html           |  6 +++---
 samples/hazelcast-spring/build.gradle                  |  5 +++++
 samples/hazelcast-spring/src/main/webapp/index.jsp     |  3 ++-
 samples/hazelcast/build.gradle                         |  5 +++++
 samples/hazelcast/src/main/webapp/index.jsp            |  3 ++-
 samples/httpsession-gemfire-boot/build.gradle          |  3 ++-
 .../src/main/resources/templates/index.html            |  2 +-
 .../httpsession-gemfire-clientserver-xml/build.gradle  |  5 +++++
 .../src/main/webapp/index.jsp                          |  3 ++-
 samples/httpsession-gemfire-clientserver/build.gradle  |  5 +++++
 .../src/main/webapp/index.jsp                          |  3 ++-
 samples/httpsession-gemfire-p2p-xml/build.gradle       |  5 +++++
 .../src/main/webapp/index.jsp                          |  3 ++-
 samples/httpsession-gemfire-p2p/build.gradle           |  5 +++++
 .../httpsession-gemfire-p2p/src/main/webapp/index.jsp  |  3 ++-
 samples/httpsession-jdbc-boot/build.gradle             |  1 +
 .../src/main/resources/templates/layout.html           |  6 +++---
 samples/httpsession-jdbc-xml/build.gradle              |  5 +++++
 samples/httpsession-jdbc-xml/src/main/webapp/index.jsp |  3 ++-
 samples/httpsession-jdbc/build.gradle                  |  5 +++++
 samples/httpsession-jdbc/src/main/webapp/index.jsp     |  3 ++-
 samples/httpsession-xml/build.gradle                   |  5 +++++
 samples/httpsession-xml/src/main/webapp/index.jsp      |  3 ++-
 samples/httpsession/build.gradle                       |  5 +++++
 samples/httpsession/src/main/webapp/index.jsp          |  2 +-
 samples/mongo/build.gradle                             |  1 +
 samples/mongo/src/main/resources/templates/layout.html |  6 +++---
 samples/security/build.gradle                          |  5 +++++
 samples/security/src/main/webapp/index.jsp             |  3 ++-
 samples/users/build.gradle                             |  5 +++++
 samples/users/src/main/webapp/index.jsp                |  7 ++++---
 samples/users/src/main/webapp/link.jsp                 |  7 ++++---
 samples/websocket/build.gradle                         |  1 +
 .../websocket/src/main/resources/templates/index.html  | 10 +++++-----
 .../websocket/src/main/resources/templates/layout.html |  6 +++---
 41 files changed, 125 insertions(+), 40 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index cd38441b..0312c269 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,3 +25,4 @@ assertjVersion=2.3.0
 spockVersion=1.0-groovy-2.4
 jstlVersion=1.2.1
 groovyVersion=2.4.4
+webjarsTaglibVersion=0.3
diff --git a/samples/boot/build.gradle b/samples/boot/build.gradle
index d3565b74..21e88cfe 100644
--- a/samples/boot/build.gradle
+++ b/samples/boot/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
+			"org.webjars:webjars-locator",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion"
 
diff --git a/samples/boot/src/main/resources/templates/layout.html b/samples/boot/src/main/resources/templates/layout.html
index ea52c788..7a66980e 100644
--- a/samples/boot/src/main/resources/templates/layout.html
+++ b/samples/boot/src/main/resources/templates/layout.html
@@ -5,7 +5,7 @@
 	<head>
 		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
 			/* Sticky footer styles
 			-------------------------------------------------- */
@@ -65,11 +65,11 @@
 				margin-left: 1em;
 			}
 		</style>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
-			<script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 
diff --git a/samples/custom-cookie/build.gradle b/samples/custom-cookie/build.gradle
index 16494769..72d63924 100644
--- a/samples/custom-cookie/build.gradle
+++ b/samples/custom-cookie/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-redis'),
 			"org.springframework:spring-web:$springVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/custom-cookie/src/main/webapp/index.jsp b/samples/custom-cookie/src/main/webapp/index.jsp
index e1f3d0ec..63de3514 100644
--- a/samples/custom-cookie/src/main/webapp/index.jsp
+++ b/samples/custom-cookie/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/findbyusername/build.gradle b/samples/findbyusername/build.gradle
index 0c70ac1e..b7c48380 100644
--- a/samples/findbyusername/build.gradle
+++ b/samples/findbyusername/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
+			"org.webjars:webjars-locator",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"com.maxmind.geoip2:geoip2:2.3.1",
diff --git a/samples/findbyusername/src/main/resources/templates/layout.html b/samples/findbyusername/src/main/resources/templates/layout.html
index edd145ab..40863f64 100644
--- a/samples/findbyusername/src/main/resources/templates/layout.html
+++ b/samples/findbyusername/src/main/resources/templates/layout.html
@@ -5,7 +5,7 @@
 	<head>
 		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
 			/* Sticky footer styles
 			-------------------------------------------------- */
@@ -65,11 +65,11 @@
 				margin-left: 1em;
 			}
 		</style>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
-			<script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 
diff --git a/samples/hazelcast-spring/build.gradle b/samples/hazelcast-spring/build.gradle
index f1c5386d..1c952822 100644
--- a/samples/hazelcast-spring/build.gradle
+++ b/samples/hazelcast-spring/build.gradle
@@ -2,12 +2,17 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session'),
 			"org.springframework:spring-web:$springVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			"com.hazelcast:hazelcast-client:$hazelcastVersion",
 			jstlDependencies
 
diff --git a/samples/hazelcast-spring/src/main/webapp/index.jsp b/samples/hazelcast-spring/src/main/webapp/index.jsp
index 569636b6..4e11eb2b 100644
--- a/samples/hazelcast-spring/src/main/webapp/index.jsp
+++ b/samples/hazelcast-spring/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Secured Content</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/hazelcast/build.gradle b/samples/hazelcast/build.gradle
index b9e44588..1abf5b5e 100644
--- a/samples/hazelcast/build.gradle
+++ b/samples/hazelcast/build.gradle
@@ -2,9 +2,14 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session'),
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			"com.hazelcast:hazelcast-client:$hazelcastVersion",
 			jstlDependencies
 
diff --git a/samples/hazelcast/src/main/webapp/index.jsp b/samples/hazelcast/src/main/webapp/index.jsp
index 5a5ce38b..b250c096 100644
--- a/samples/hazelcast/src/main/webapp/index.jsp
+++ b/samples/hazelcast/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>Session Attributes</title>
-    <link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+    <link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
     <style type="text/css">
         body {
             padding: 1em;
diff --git a/samples/httpsession-gemfire-boot/build.gradle b/samples/httpsession-gemfire-boot/build.gradle
index 716a9662..8c2f5f9a 100644
--- a/samples/httpsession-gemfire-boot/build.gradle
+++ b/samples/httpsession-gemfire-boot/build.gradle
@@ -21,7 +21,8 @@ dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework.boot:spring-boot-starter-thymeleaf",
 		"org.springframework.boot:spring-boot-starter-web",
-		"org.webjars:bootstrap:$bootstrapVersion"
+		"org.webjars:bootstrap:$bootstrapVersion",
+		"org.webjars:webjars-locator"
 
 	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
 
diff --git a/samples/httpsession-gemfire-boot/src/main/resources/templates/index.html b/samples/httpsession-gemfire-boot/src/main/resources/templates/index.html
index 74e70524..e84fe930 100644
--- a/samples/httpsession-gemfire-boot/src/main/resources/templates/index.html
+++ b/samples/httpsession-gemfire-boot/src/main/resources/templates/index.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="/webjars/bootstrap/2.2.2/css/bootstrap.min.css"/>
+	<link rel="stylesheet" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css"/>
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/httpsession-gemfire-clientserver-xml/build.gradle b/samples/httpsession-gemfire-clientserver-xml/build.gradle
index 2ea09ab6..58002084 100644
--- a/samples/httpsession-gemfire-clientserver-xml/build.gradle
+++ b/samples/httpsession-gemfire-clientserver-xml/build.gradle
@@ -8,10 +8,15 @@ sonarqube {
 	skipProject = true
 }
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
+		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 		jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/index.jsp b/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/index.jsp
index 1e71522a..d8295a78 100644
--- a/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/index.jsp
+++ b/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/httpsession-gemfire-clientserver/build.gradle b/samples/httpsession-gemfire-clientserver/build.gradle
index 78e8a6a2..e9ec3892 100644
--- a/samples/httpsession-gemfire-clientserver/build.gradle
+++ b/samples/httpsession-gemfire-clientserver/build.gradle
@@ -3,10 +3,15 @@ apply from: TOMCAT_7_GRADLE
 apply plugin: "application"
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
+		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 		jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/httpsession-gemfire-clientserver/src/main/webapp/index.jsp b/samples/httpsession-gemfire-clientserver/src/main/webapp/index.jsp
index 1e71522a..d8295a78 100644
--- a/samples/httpsession-gemfire-clientserver/src/main/webapp/index.jsp
+++ b/samples/httpsession-gemfire-clientserver/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/httpsession-gemfire-p2p-xml/build.gradle b/samples/httpsession-gemfire-p2p-xml/build.gradle
index 90c09e5b..3f03cfaf 100644
--- a/samples/httpsession-gemfire-p2p-xml/build.gradle
+++ b/samples/httpsession-gemfire-p2p-xml/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
+		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 		jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/httpsession-gemfire-p2p-xml/src/main/webapp/index.jsp b/samples/httpsession-gemfire-p2p-xml/src/main/webapp/index.jsp
index 88dcfc1a..f40ff144 100644
--- a/samples/httpsession-gemfire-p2p-xml/src/main/webapp/index.jsp
+++ b/samples/httpsession-gemfire-p2p-xml/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>Session Attributes</title>
-    <link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+    <link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
     <style type="text/css">
         body {
             padding: 1em;
diff --git a/samples/httpsession-gemfire-p2p/build.gradle b/samples/httpsession-gemfire-p2p/build.gradle
index 90c09e5b..3f03cfaf 100644
--- a/samples/httpsession-gemfire-p2p/build.gradle
+++ b/samples/httpsession-gemfire-p2p/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
+		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 		jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/httpsession-gemfire-p2p/src/main/webapp/index.jsp b/samples/httpsession-gemfire-p2p/src/main/webapp/index.jsp
index 1e71522a..d8295a78 100644
--- a/samples/httpsession-gemfire-p2p/src/main/webapp/index.jsp
+++ b/samples/httpsession-gemfire-p2p/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/httpsession-jdbc-boot/build.gradle b/samples/httpsession-jdbc-boot/build.gradle
index 5c696cfa..319a183e 100644
--- a/samples/httpsession-jdbc-boot/build.gradle
+++ b/samples/httpsession-jdbc-boot/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
+			"org.webjars:webjars-locator",
 			"com.h2database:h2",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion"
diff --git a/samples/httpsession-jdbc-boot/src/main/resources/templates/layout.html b/samples/httpsession-jdbc-boot/src/main/resources/templates/layout.html
index ea52c788..7a66980e 100644
--- a/samples/httpsession-jdbc-boot/src/main/resources/templates/layout.html
+++ b/samples/httpsession-jdbc-boot/src/main/resources/templates/layout.html
@@ -5,7 +5,7 @@
 	<head>
 		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
 			/* Sticky footer styles
 			-------------------------------------------------- */
@@ -65,11 +65,11 @@
 				margin-left: 1em;
 			}
 		</style>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
-			<script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 
diff --git a/samples/httpsession-jdbc-xml/build.gradle b/samples/httpsession-jdbc-xml/build.gradle
index e80d7b9f..572326e7 100644
--- a/samples/httpsession-jdbc-xml/build.gradle
+++ b/samples/httpsession-jdbc-xml/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_6_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-jdbc'),
 			"org.springframework:spring-web:$springVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			"com.h2database:h2:$h2Version",
 			jstlDependencies
 
diff --git a/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp b/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp
index e4b35077..bb54ec2f 100644
--- a/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp
+++ b/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/httpsession-jdbc/build.gradle b/samples/httpsession-jdbc/build.gradle
index e59419c1..0740c8da 100644
--- a/samples/httpsession-jdbc/build.gradle
+++ b/samples/httpsession-jdbc/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-jdbc'),
 			"org.springframework:spring-web:$springVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			"com.h2database:h2:$h2Version",
 			jstlDependencies
 
diff --git a/samples/httpsession-jdbc/src/main/webapp/index.jsp b/samples/httpsession-jdbc/src/main/webapp/index.jsp
index e4b35077..bb54ec2f 100644
--- a/samples/httpsession-jdbc/src/main/webapp/index.jsp
+++ b/samples/httpsession-jdbc/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/httpsession-xml/build.gradle b/samples/httpsession-xml/build.gradle
index b3cc78b6..a936964c 100644
--- a/samples/httpsession-xml/build.gradle
+++ b/samples/httpsession-xml/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_6_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-redis'),
 			"org.springframework:spring-web:$springVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/httpsession-xml/src/main/webapp/index.jsp b/samples/httpsession-xml/src/main/webapp/index.jsp
index 5e674b0a..57ad9470 100644
--- a/samples/httpsession-xml/src/main/webapp/index.jsp
+++ b/samples/httpsession-xml/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>Session Attributes</title>
-    <link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+    <link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
     <style type="text/css">
         body {
             padding: 1em;
diff --git a/samples/httpsession/build.gradle b/samples/httpsession/build.gradle
index 16494769..72d63924 100644
--- a/samples/httpsession/build.gradle
+++ b/samples/httpsession/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-redis'),
 			"org.springframework:spring-web:$springVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/httpsession/src/main/webapp/index.jsp b/samples/httpsession/src/main/webapp/index.jsp
index e1f3d0ec..22f1e333 100644
--- a/samples/httpsession/src/main/webapp/index.jsp
+++ b/samples/httpsession/src/main/webapp/index.jsp
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/mongo/build.gradle b/samples/mongo/build.gradle
index f857409a..c708cee5 100644
--- a/samples/mongo/build.gradle
+++ b/samples/mongo/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
+			"org.webjars:webjars-locator",
 			"de.flapdoodle.embed:de.flapdoodle.embed.mongo",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion"
diff --git a/samples/mongo/src/main/resources/templates/layout.html b/samples/mongo/src/main/resources/templates/layout.html
index ea52c788..7a66980e 100644
--- a/samples/mongo/src/main/resources/templates/layout.html
+++ b/samples/mongo/src/main/resources/templates/layout.html
@@ -5,7 +5,7 @@
 	<head>
 		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
 			/* Sticky footer styles
 			-------------------------------------------------- */
@@ -65,11 +65,11 @@
 				margin-left: 1em;
 			}
 		</style>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
-			<script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 
diff --git a/samples/security/build.gradle b/samples/security/build.gradle
index c77b6c91..c3debb47 100644
--- a/samples/security/build.gradle
+++ b/samples/security/build.gradle
@@ -2,12 +2,17 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-redis'),
 			"org.springframework:spring-web:$springVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion",
diff --git a/samples/security/src/main/webapp/index.jsp b/samples/security/src/main/webapp/index.jsp
index ca51ee35..1da4e673 100644
--- a/samples/security/src/main/webapp/index.jsp
+++ b/samples/security/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Secured Content</title>
-	<link rel="stylesheet" href="<c:url value="/webjars/bootstrap/2.3.2/css/bootstrap.min.css"/>">
+	<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/samples/users/build.gradle b/samples/users/build.gradle
index 1b40af5f..93ed8a2e 100644
--- a/samples/users/build.gradle
+++ b/samples/users/build.gradle
@@ -2,10 +2,15 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
+configurations {
+	compile.exclude group: 'org.slf4j', module: 'slf4j-api'
+}
+
 dependencies {
 	compile project(':spring-session-data-redis'),
 			"org.springframework:spring-web:$springVersion",
 			"org.webjars:bootstrap:3.3.6",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
diff --git a/samples/users/src/main/webapp/index.jsp b/samples/users/src/main/webapp/index.jsp
index 69c8428c..61bdc66c 100644
--- a/samples/users/src/main/webapp/index.jsp
+++ b/samples/users/src/main/webapp/index.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>Demonstrates Multi User Log In</title>
-    <link rel="stylesheet" href="<c:url value="/webjars/bootstrap/3.3.6/css/bootstrap.min.css"/>">
+    <link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
     <style type="text/css">
         body {
             padding: 1em;
@@ -100,8 +101,8 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="<c:url value="/webjars/jquery/1.11.1/jquery.min.js"/>"></script>
-    <script src="<c:url value="/webjars/bootstrap/3.3.6/js/bootstrap.min.js"/>"></script>
+    <script src="<wj:locate path="jquery.min.js" relativeTo="META-INF/resources"/>"></script>
+    <script src="<wj:locate path="bootstrap.min.js" relativeTo="META-INF/resources"/>"></script>
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <script src="<c:url value="/assets/js/ie10-viewport-bug-workaround.js"/>"></script>
 </body>
diff --git a/samples/users/src/main/webapp/link.jsp b/samples/users/src/main/webapp/link.jsp
index d54b1ac9..1d699cc0 100644
--- a/samples/users/src/main/webapp/link.jsp
+++ b/samples/users/src/main/webapp/link.jsp
@@ -1,9 +1,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>Linked Page</title>
-    <link rel="stylesheet" href="<c:url value="/webjars/bootstrap/3.3.6/css/bootstrap.min.css"/>">
+    <link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
     <style type="text/css">
         body {
             padding: 1em;
@@ -73,8 +74,8 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="<c:url value="/webjars/jquery/1.11.1/jquery.min.js"/>"></script>
-    <script src="<c:url value="/webjars/bootstrap/3.3.6/js/bootstrap.min.js"/>"></script>
+    <script src="<wj:locate path="jquery.min.js" relativeTo="META-INF/resources"/>"></script>
+    <script src="<wj:locate path="bootstrap.min.js" relativeTo="META-INF/resources"/>"></script>
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <script src="<c:url value="/assets/js/ie10-viewport-bug-workaround.js"/>"></script>
 </body>
diff --git a/samples/websocket/build.gradle b/samples/websocket/build.gradle
index b636c1c6..e3a063d0 100644
--- a/samples/websocket/build.gradle
+++ b/samples/websocket/build.gradle
@@ -30,6 +30,7 @@ dependencies {
 			"org.webjars:knockout:2.3.0",
 			"org.webjars:sockjs-client:0.3.4",
 			"org.webjars:stomp-websocket:2.3.0",
+			"org.webjars:webjars-locator",
 			"com.h2database:h2",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
diff --git a/samples/websocket/src/main/resources/templates/index.html b/samples/websocket/src/main/resources/templates/index.html
index 808e01cf..328a3b45 100644
--- a/samples/websocket/src/main/resources/templates/index.html
+++ b/samples/websocket/src/main/resources/templates/index.html
@@ -49,11 +49,11 @@
 
 
 	<!-- 3rd party -->
-	<script th:src="@{/webjars/jquery/1.9.0/jquery.min.js}" src="/webjars/jquery/1.9.0/jquery.min.js"></script>
-	<script th:src="@{/webjars/bootstrap/2.3.2/js/bootstrap.min.js}" src="/webjars/bootstrap/2.3.2/js/bootstrap.min.js"></script>
-	<script th:src="@{/webjars/knockout/2.3.0/knockout.js}" src="/webjars/knockout/2.3.0/knockout.js"></script>
-	<script th:src="@{/webjars/sockjs-client/0.3.4/sockjs.min.js}" src="/webjars/sockjs-client/0.3.4/sockjs.min.js"></script>
-	<script th:src="@{/webjars/stomp-websocket/2.3.0/stomp.min.js}" src="/webjars/stomp-websocket/2.3.0/stomp.min.js"></script>
+	<script th:src="@{/webjars/jquery/jquery.min.js}" src="/webjars/jquery/jquery.min.js"></script>
+	<script th:src="@{/webjars/bootstrap/js/bootstrap.min.js}" src="/webjars/bootstrap/js/bootstrap.min.js"></script>
+	<script th:src="@{/webjars/knockout/knockout.js}" src="/webjars/knockout/knockout.js"></script>
+	<script th:src="@{/webjars/sockjs-client/sockjs.min.js}" src="/webjars/sockjs-client/sockjs.min.js"></script>
+	<script th:src="@{/webjars/stomp-websocket/stomp.min.js}" src="/webjars/stomp-websocket/stomp.min.js"></script>
 
 	<!-- application -->
 	<script src="resources/js/message.js"></script>
diff --git a/samples/websocket/src/main/resources/templates/layout.html b/samples/websocket/src/main/resources/templates/layout.html
index 02fb4da8..5f47ed21 100644
--- a/samples/websocket/src/main/resources/templates/layout.html
+++ b/samples/websocket/src/main/resources/templates/layout.html
@@ -5,7 +5,7 @@
 <head>
 	<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">SecureMail</title>
 	<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
-	<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+	<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 	<style type="text/css">
 	  /* Sticky footer styles
 	  -------------------------------------------------- */
@@ -65,11 +65,11 @@
 		margin-left: 1em;
 	  }
 	</style>
-	<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+	<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 	<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 	<!--[if lt IE 9]>
-	  <script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+	  <script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 	<![endif]-->
 </head>