From 655ad90813df1e02ff9c10a8c88dff6f9125cfbc Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 12 Jun 2014 12:01:04 -0500 Subject: [PATCH] SEC-2617: Fix JSTL Samples --- gradle/javaprojects.gradle | 5 +++++ samples/contacts-xml/contacts.gradle | 2 +- samples/contacts-xml/pom.xml | 6 ++++++ samples/helloworld-jc/build.gradle | 2 +- samples/helloworld-jc/pom.xml | 6 ++++++ samples/insecure/build.gradle | 2 +- samples/jaas-xml/jaas.gradle | 2 +- samples/jaas-xml/pom.xml | 6 ++++++ samples/openid-xml/openid.gradle | 4 +--- samples/servletapi-xml/servletapi.gradle | 2 +- samples/tutorial-xml/tutorial.gradle | 2 +- 11 files changed, 30 insertions(+), 9 deletions(-) diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 1bbaf529c0..8f6cbd3316 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -49,6 +49,11 @@ ext.powerMockDependencies = [ "org.powermock:powermock-reflect:$powerMockVersion" ] +ext.jstlDependencies = [ + "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + "org.apache.taglibs:taglibs-standard-jstlel:1.2.1" +] + ext.apachedsDependencies = [ "org.apache.directory.server:apacheds-core:$apacheDsVersion", "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion", diff --git a/samples/contacts-xml/contacts.gradle b/samples/contacts-xml/contacts.gradle index 717e226b43..62169a7774 100644 --- a/samples/contacts-xml/contacts.gradle +++ b/samples/contacts-xml/contacts.gradle @@ -19,7 +19,7 @@ dependencies { project(':spring-security-config'), project(':spring-security-taglibs'), "org.springframework:spring-context-support:$springVersion", - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + jstlDependencies, "org.hsqldb:hsqldb:$hsqlVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion", "ch.qos.logback:logback-classic:$logbackVersion", diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index 1210e906ba..ca72874388 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -154,6 +154,12 @@ 1.7.2 runtime + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + org.hsqldb hsqldb diff --git a/samples/helloworld-jc/build.gradle b/samples/helloworld-jc/build.gradle index 9f9078150e..70868f0e11 100644 --- a/samples/helloworld-jc/build.gradle +++ b/samples/helloworld-jc/build.gradle @@ -7,7 +7,7 @@ dependencies { compile project(":spring-security-config"), project(":spring-security-web"), - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + jstlDependencies, "org.slf4j:jcl-over-slf4j:$slf4jVersion" runtime "ch.qos.logback:logback-classic:$logbackVersion" diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 1ac8c3d1cb..6f567bd718 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -63,6 +63,12 @@ 1.2.1 compile + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + compile + org.slf4j jcl-over-slf4j diff --git a/samples/insecure/build.gradle b/samples/insecure/build.gradle index 76cd069a48..d77523ee45 100644 --- a/samples/insecure/build.gradle +++ b/samples/insecure/build.gradle @@ -5,7 +5,7 @@ dependencies { providedCompile "javax.servlet:javax.servlet-api:3.0.1", 'javax.servlet.jsp:jsp-api:2.1' - compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + compile jstlDependencies, "org.slf4j:jcl-over-slf4j:$slf4jVersion" runtime "ch.qos.logback:logback-classic:$logbackVersion" diff --git a/samples/jaas-xml/jaas.gradle b/samples/jaas-xml/jaas.gradle index 943df29b91..1ae4fa558e 100644 --- a/samples/jaas-xml/jaas.gradle +++ b/samples/jaas-xml/jaas.gradle @@ -23,7 +23,7 @@ dependencies { project(':spring-security-config'), project(':spring-security-taglibs'), "org.springframework:spring-context-support:$springVersion", - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + jstlDependencies, "org.slf4j:jcl-over-slf4j:$slf4jVersion", "ch.qos.logback:logback-classic:$logbackVersion" } \ No newline at end of file diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index 60845f645a..1d75bcf20e 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -118,6 +118,12 @@ 1.2.1 runtime + + org.apache.taglibs + taglibs-standard-jstlel + 1.2.1 + runtime + org.slf4j jcl-over-slf4j diff --git a/samples/openid-xml/openid.gradle b/samples/openid-xml/openid.gradle index 5a4d9f3481..75073847cf 100644 --- a/samples/openid-xml/openid.gradle +++ b/samples/openid-xml/openid.gradle @@ -11,9 +11,7 @@ dependencies { runtime project(':spring-security-config'), project(':spring-security-taglibs'), -// 'xerces:xercesImpl:2.9.1', -// 'net.sourceforge.nekohtml:nekohtml:1.9.7', - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + jstlDependencies, "org.slf4j:jcl-over-slf4j:$slf4jVersion", "ch.qos.logback:logback-classic:$logbackVersion" } diff --git a/samples/servletapi-xml/servletapi.gradle b/samples/servletapi-xml/servletapi.gradle index bcd0669233..d371ae9825 100644 --- a/samples/servletapi-xml/servletapi.gradle +++ b/samples/servletapi-xml/servletapi.gradle @@ -26,7 +26,7 @@ dependencies { runtime project(':spring-security-config'), project(':spring-security-taglibs'), "org.springframework:spring-context-support:$springVersion", - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + jstlDependencies, "org.slf4j:jcl-over-slf4j:$slf4jVersion", "ch.qos.logback:logback-classic:$logbackVersion" } diff --git a/samples/tutorial-xml/tutorial.gradle b/samples/tutorial-xml/tutorial.gradle index 8bed813596..ae330b9c79 100644 --- a/samples/tutorial-xml/tutorial.gradle +++ b/samples/tutorial-xml/tutorial.gradle @@ -27,7 +27,7 @@ dependencies { runtime project(':spring-security-web'), project(':spring-security-config'), project(':spring-security-taglibs'), - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", + jstlDependencies, "org.slf4j:jcl-over-slf4j:$slf4jVersion", "ch.qos.logback:logback-core:$logbackVersion", "ch.qos.logback:logback-classic:$logbackVersion"