From 8f9c69ea02748a32188c3ea581d01dc5acebbd8e Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Thu, 1 Dec 2022 09:07:19 -0300 Subject: [PATCH] Add jakarta.servlet.jsp.jstl-api to non Spring Boot samples Closes gh-2216 --- .../spring-session-sample-javaconfig-custom-cookie.gradle | 5 +++-- .../spring-session-sample-javaconfig-hazelcast.gradle | 1 + .../spring-session-sample-javaconfig-jdbc.gradle | 1 + .../spring-session-sample-javaconfig-redis.gradle | 1 + .../spring-session-sample-javaconfig-security.gradle | 1 + .../spring-session-sample-misc-hazelcast.gradle | 1 + .../spring-session-sample-xml-jdbc.gradle | 3 ++- .../spring-session-sample-xml-redis.gradle | 1 + 8 files changed, 11 insertions(+), 3 deletions(-) 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 65c02b54..49dde85f 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 @@ -13,8 +13,9 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "jakarta.servlet:jakarta.servlet-api" - providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet:jakarta.servlet-api" + providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" 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 index fcdf9116..dd9b6ab2 100644 --- 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 @@ -16,6 +16,7 @@ dependencies { providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" 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 index 05e5526b..bc9cecae 100644 --- 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 @@ -14,6 +14,7 @@ dependencies { providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" 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 index 2af20d30..9b99ebd7 100644 --- 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 @@ -15,6 +15,7 @@ dependencies { providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" 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 index 09b0ee5c..9a46824d 100644 --- 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 @@ -17,6 +17,7 @@ dependencies { providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.springframework:spring-test" 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 index 05569909..6f7d0695 100644 --- 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 @@ -13,6 +13,7 @@ dependencies { providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" 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 index 3693c871..410cc92b 100644 --- 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 @@ -13,7 +13,8 @@ dependencies { implementation "ch.qos.logback:logback-classic" providedCompile "jakarta.servlet:jakarta.servlet-api" - providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" 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 index 2af20d30..9b99ebd7 100644 --- 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 @@ -15,6 +15,7 @@ dependencies { providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" + providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api"