From 2feded5fc52baea4618de7d93bc344c7accd2d0b Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 9 Aug 2013 11:51:34 -0500 Subject: [PATCH] SEC-2194: Update samples to have jsp-api --- samples/concurrency-jc/build.gradle | 3 ++- samples/concurrency-jc/pom.xml | 6 ++++++ samples/hellomvc-jc/build.gradle | 3 ++- samples/hellomvc-jc/pom.xml | 6 ++++++ samples/helloworld-jc/build.gradle | 3 ++- samples/helloworld-jc/pom.xml | 6 ++++++ samples/inmemory-jc/build.gradle | 3 ++- samples/inmemory-jc/pom.xml | 6 ++++++ samples/insecuremvc/build.gradle | 3 ++- samples/insecuremvc/pom.xml | 6 ++++++ samples/jdbc-jc/build.gradle | 3 ++- samples/jdbc-jc/pom.xml | 6 ++++++ samples/ldap-jc/build.gradle | 3 ++- samples/ldap-jc/pom.xml | 6 ++++++ samples/openid-jc/build.gradle | 3 ++- samples/openid-jc/pom.xml | 6 ++++++ samples/preauth-jc/build.gradle | 3 ++- samples/preauth-jc/pom.xml | 6 ++++++ samples/rememberme-jc/build.gradle | 3 ++- samples/rememberme-jc/pom.xml | 6 ++++++ samples/x509-jc/build.gradle | 3 ++- samples/x509-jc/pom.xml | 6 ++++++ 22 files changed, 88 insertions(+), 11 deletions(-) diff --git a/samples/concurrency-jc/build.gradle b/samples/concurrency-jc/build.gradle index e8d577af9e..f2696c79ca 100644 --- a/samples/concurrency-jc/build.gradle +++ b/samples/concurrency-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index ff83a77e24..77c0dff4b6 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/hellomvc-jc/build.gradle b/samples/hellomvc-jc/build.gradle index e8d577af9e..f2696c79ca 100644 --- a/samples/hellomvc-jc/build.gradle +++ b/samples/hellomvc-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index a14f85f7e1..128a93d49a 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/helloworld-jc/build.gradle b/samples/helloworld-jc/build.gradle index 062927c27c..dfc4d5864a 100644 --- a/samples/helloworld-jc/build.gradle +++ b/samples/helloworld-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-web"), diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 19727c3025..fc403911a5 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -93,6 +93,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/inmemory-jc/build.gradle b/samples/inmemory-jc/build.gradle index e8d577af9e..f2696c79ca 100644 --- a/samples/inmemory-jc/build.gradle +++ b/samples/inmemory-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index 42281b542c..f5c6a841a1 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/insecuremvc/build.gradle b/samples/insecuremvc/build.gradle index 8912edc1ce..a0797769aa 100644 --- a/samples/insecuremvc/build.gradle +++ b/samples/insecuremvc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-samples-messages-jc"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index c7614e33b9..66bb73a87f 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -129,6 +129,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/jdbc-jc/build.gradle b/samples/jdbc-jc/build.gradle index e8d577af9e..f2696c79ca 100644 --- a/samples/jdbc-jc/build.gradle +++ b/samples/jdbc-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index dfac7de28b..569c9af882 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/ldap-jc/build.gradle b/samples/ldap-jc/build.gradle index 9823ce6d28..2292ded7d1 100644 --- a/samples/ldap-jc/build.gradle +++ b/samples/ldap-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-ldap"), apacheds_libs, diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index eb9f6b9568..ca67ed9e87 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -189,6 +189,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/openid-jc/build.gradle b/samples/openid-jc/build.gradle index 9395b55960..4e60264c6f 100644 --- a/samples/openid-jc/build.gradle +++ b/samples/openid-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-openid"), diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index 6586c5da5c..b15669e95a 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -153,6 +153,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/preauth-jc/build.gradle b/samples/preauth-jc/build.gradle index e8d577af9e..f2696c79ca 100644 --- a/samples/preauth-jc/build.gradle +++ b/samples/preauth-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index 906231ebbf..318770980a 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/rememberme-jc/build.gradle b/samples/rememberme-jc/build.gradle index e8d577af9e..f2696c79ca 100644 --- a/samples/rememberme-jc/build.gradle +++ b/samples/rememberme-jc/build.gradle @@ -2,7 +2,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index a8ebd03c0c..5a8775077e 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api diff --git a/samples/x509-jc/build.gradle b/samples/x509-jc/build.gradle index 300d406eb9..b7b6f15105 100644 --- a/samples/x509-jc/build.gradle +++ b/samples/x509-jc/build.gradle @@ -3,7 +3,8 @@ apply from: WAR_SAMPLE_GRADLE dependencies { - providedCompile "javax.servlet:javax.servlet-api:3.0.1" + providedCompile "javax.servlet:javax.servlet-api:3.0.1", + 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), project(":spring-security-samples-messages-jc"), diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index 49636d53ca..572a25ef42 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -147,6 +147,12 @@ compile true + + javax.servlet.jsp + jsp-api + 2.1 + provided + javax.servlet javax.servlet-api