Remove unnecessary code from samples

eleftherias · eleftherias · commit cc1fd826acc7 · 2021-11-12T10:42:23.000+01:00
Remove code that is not necessary to demonstrate Spring Session functionality and is not compatible with the Java 17 / Jakarta EE 9 upgrades. Issue gh-1949
diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle
@@ -18,6 +18,5 @@ dependencyManagement {
 		dependency 'org.webjars:knockout:3.5.1'
 		dependency 'org.webjars:sockjs-client:1.5.1'
 		dependency 'org.webjars:stomp-websocket:2.3.4'
-		dependency 'org.webjars:webjars-taglib:0.3'
 	}
 }
diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
@@ -7,8 +7,6 @@ dependencies {
 	implementation  project(':spring-session-data-redis')
 	implementation  "org.springframework:spring-web"
 	implementation  "io.lettuce:lettuce-core"
-	implementation  "org.webjars:bootstrap"
-	implementation  "org.webjars:webjars-taglib"
 	implementation  "org.slf4j:slf4j-api"
 	implementation  "org.slf4j:jcl-over-slf4j"
 	implementation  "org.slf4j:log4j-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -9,8 +9,6 @@ dependencies {
 	implementation "org.springframework:spring-web"
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "com.hazelcast:hazelcast"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
@@ -6,8 +6,6 @@ plugins {
 dependencies {
 	implementation project(':spring-session-jdbc')
 	implementation  "org.springframework:spring-web"
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "com.h2database:h2"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/src/main/java/sample/H2ConsoleInitializer.java b/spring-session-samples/spring-session-sample-javaconfig-jdbc/src/main/java/sample/H2ConsoleInitializer.java
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-javaconfig-jdbc/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
@@ -7,8 +7,6 @@ dependencies {
 	implementation project(':spring-session-data-redis')
 	implementation "org.springframework:spring-web"
 	implementation "io.lettuce:lettuce-core"
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
 	implementation "org.slf4j:log4j-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
@@ -9,8 +9,6 @@ dependencies {
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
 	implementation "io.lettuce:lettuce-core"
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
 	implementation "org.slf4j:log4j-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-javaconfig-security/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
@@ -5,17 +5,14 @@ plugins {
 
 dependencies {
 	implementation project(':spring-session-core')
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "com.hazelcast:hazelcast"
-	implementation "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
-	implementation "org.apache.taglibs:taglibs-standard-jstlel"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
 	providedCompile "jakarta.servlet:jakarta.servlet-api"
+    providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-misc-hazelcast/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-    <wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-    <link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
     <style type="text/css">
         body {
             padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
@@ -6,8 +6,6 @@ plugins {
 dependencies {
 	implementation project(':spring-session-jdbc')
 	implementation "org.springframework:spring-web"
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "com.h2database:h2"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-xml-jdbc/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;
diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
@@ -7,8 +7,6 @@ dependencies {
 	implementation project(':spring-session-data-redis')
 	implementation "org.springframework:spring-web"
 	implementation "io.lettuce:lettuce-core"
-	implementation "org.webjars:bootstrap"
-	implementation "org.webjars:webjars-taglib"
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
 	implementation "org.slf4j:log4j-over-slf4j"
diff --git a/spring-session-samples/spring-session-sample-xml-redis/src/main/webapp/index.jsp b/spring-session-samples/spring-session-sample-xml-redis/src/main/webapp/index.jsp
@@ -1,11 +1,8 @@
 <%@ 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>
-    <wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
-    <link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
     <style type="text/css">
         body {
             padding: 1em;

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,5 @@ dependencyManagement {`
`18`	`18`	`dependency 'org.webjars:knockout:3.5.1'`
`19`	`19`	`dependency 'org.webjars:sockjs-client:1.5.1'`
`20`	`20`	`dependency 'org.webjars:stomp-websocket:2.3.4'`
`21`		`- dependency 'org.webjars:webjars-taglib:0.3'`
`22`	`21`	`}`
`23`	`22`	`}`