From cc1fd826acc73f913ff96d8c533468e6a28fa9c2 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 12 Nov 2021 10:35:35 +0100 Subject: [PATCH] Remove unnecessary code from samples 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 --- .../gradle/dependency-management.gradle | 1 - ...ion-sample-javaconfig-custom-cookie.gradle | 2 -- .../src/main/webapp/index.jsp | 3 -- ...session-sample-javaconfig-hazelcast.gradle | 2 -- .../src/main/webapp/index.jsp | 3 -- ...ring-session-sample-javaconfig-jdbc.gradle | 2 -- .../java/sample/H2ConsoleInitializer.java | 32 ------------------- .../src/main/webapp/index.jsp | 3 -- ...ing-session-sample-javaconfig-redis.gradle | 2 -- .../src/main/webapp/index.jsp | 3 -- ...-session-sample-javaconfig-security.gradle | 2 -- .../src/main/webapp/index.jsp | 3 -- ...pring-session-sample-misc-hazelcast.gradle | 5 +-- .../src/main/webapp/index.jsp | 3 -- .../spring-session-sample-xml-jdbc.gradle | 2 -- .../src/main/webapp/index.jsp | 3 -- .../spring-session-sample-xml-redis.gradle | 2 -- .../src/main/webapp/index.jsp | 3 -- 18 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 spring-session-samples/spring-session-sample-javaconfig-jdbc/src/main/java/sample/H2ConsoleInitializer.java diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 935b76ef..0f1ca182 100644 --- 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 index decbd82a..65c02b54 100644 --- 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 index fb87b0df..481a3984 100644 --- 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" %> Session Attributes - - ">