SEC-2617: Fix JSTL Samples

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",

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",

samples/contacts-xml/pom.xml

@@ -154,6 +154,12 @@
       <version>2.6.5</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>

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"

samples/helloworld-jc/pom.xml

@@ -63,6 +63,12 @@
       <version>1.2.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

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"

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"
 }

samples/jaas-xml/pom.xml

@@ -118,6 +118,12 @@
       <version>1.2.1</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>

samples/openid-xml/openid.gradle

@@ -11,9 +11,7 @@ dependencies {
 
     runtime project(':spring-security-config'),
             project(':spring-security-taglibs'),
-//            'xerces:xercesImpl:2.9.1',
+            jstlDependencies,
-//            'net.sourceforge.nekohtml:nekohtml:1.9.7',
-            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
             "org.slf4j:jcl-over-slf4j:$slf4jVersion",
             "ch.qos.logback:logback-classic:$logbackVersion"
 }

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"
 }

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"