From 5ee77ed0f1558286e09914838c995262860e5df5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 2 Dec 2021 23:36:48 -0800 Subject: [PATCH] Refactor all Spring Session, Apache Geode Web Samples to use Glassfish Web Jarkarta Servlet JSP JTL implementation. Remove use of WebJars. --- ...ing-session-sample-javaconfig-gemfire-clientserver.gradle | 4 +--- .../spring-session-sample-javaconfig-gemfire-p2p.gradle | 5 +---- .../spring-session-sample-xml-gemfire-clientserver.gradle | 4 +--- .../gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle | 5 +---- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle index 562cf6d..5061d9a 100644 --- a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle +++ b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle @@ -1,8 +1,8 @@ plugins { id "org.gretty" version "4.0.0" + id "io.spring.convention.spring-sample-war" } -apply plugin: 'io.spring.convention.spring-sample-war' apply plugin: "gemfire-server" apply plugin: "application" @@ -11,8 +11,6 @@ dependencies { implementation project(':spring-session-data-geode') implementation "org.springframework:spring-web" implementation "org.springframework.data:spring-data-geode-test" - implementation "org.webjars:bootstrap" - implementation "org.webjars:webjars-taglib" implementation jstlDependencies implementation slf4jDependencies diff --git a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle index dca6213..d67dd5a 100644 --- a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle +++ b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle @@ -1,15 +1,12 @@ plugins { id "org.gretty" version "4.0.0" + id "io.spring.convention.spring-sample-war" } -apply plugin: 'io.spring.convention.spring-sample-war' - dependencies { implementation project(':spring-session-data-geode') implementation "org.springframework:spring-web" - implementation "org.webjars:bootstrap" - implementation "org.webjars:webjars-taglib" implementation jstlDependencies implementation slf4jDependencies diff --git a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle index 562cf6d..5061d9a 100644 --- a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle +++ b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle @@ -1,8 +1,8 @@ plugins { id "org.gretty" version "4.0.0" + id "io.spring.convention.spring-sample-war" } -apply plugin: 'io.spring.convention.spring-sample-war' apply plugin: "gemfire-server" apply plugin: "application" @@ -11,8 +11,6 @@ dependencies { implementation project(':spring-session-data-geode') implementation "org.springframework:spring-web" implementation "org.springframework.data:spring-data-geode-test" - implementation "org.webjars:bootstrap" - implementation "org.webjars:webjars-taglib" implementation jstlDependencies implementation slf4jDependencies diff --git a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle index dca6213..d67dd5a 100644 --- a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle +++ b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle @@ -1,15 +1,12 @@ plugins { id "org.gretty" version "4.0.0" + id "io.spring.convention.spring-sample-war" } -apply plugin: 'io.spring.convention.spring-sample-war' - dependencies { implementation project(':spring-session-data-geode') implementation "org.springframework:spring-web" - implementation "org.webjars:bootstrap" - implementation "org.webjars:webjars-taglib" implementation jstlDependencies implementation slf4jDependencies