diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 721761c47a..e749352ea4 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -6,7 +6,7 @@ springLdapVersion = '1.3.0.RELEASE' ehcacheVersion = '1.6.2' aspectjVersion = '1.6.8' apacheDsVersion = '1.5.5' -jstlVersion = '1.1.2' +jstlVersion = '1.2' jettyVersion = '6.1.22' hsqlVersion = '1.8.0.10' slf4jVersion = '1.6.1' diff --git a/samples/contacts/contacts.gradle b/samples/contacts/contacts.gradle index cec064b13b..7de196eb97 100644 --- a/samples/contacts/contacts.gradle +++ b/samples/contacts/contacts.gradle @@ -24,4 +24,8 @@ dependencies { "net.sf.ehcache:ehcache:$ehcacheVersion", "hsqldb:hsqldb:$hsqlVersion", 'log4j:log4j:1.2.15@jar' +} + +jettyRun { + contextPath = "/tutorial" } \ No newline at end of file diff --git a/samples/runall.sh b/samples/runall.sh index aab851af29..6d952dc9e6 100755 --- a/samples/runall.sh +++ b/samples/runall.sh @@ -24,7 +24,7 @@ cleanup() { start_jetty() { - mvn -o jetty:run > runall.log & + gradle -d jettyRun > runall.log & until (grep "Started Jetty Server" runall.log) do echo "- Waiting for server to start... -" diff --git a/samples/tutorial/tutorial.gradle b/samples/tutorial/tutorial.gradle index ec2a90d014..022f5f0136 100644 --- a/samples/tutorial/tutorial.gradle +++ b/samples/tutorial/tutorial.gradle @@ -16,4 +16,8 @@ dependencies { project(':spring-security-config'), project(':spring-security-taglibs'), 'log4j:log4j:1.2.15@jar' +} + +jettyRun { + contextPath = "/tutorial" } \ No newline at end of file diff --git a/taglibs/taglibs.gradle b/taglibs/taglibs.gradle index 7765bf5f15..af05965bb5 100644 --- a/taglibs/taglibs.gradle +++ b/taglibs/taglibs.gradle @@ -11,5 +11,5 @@ dependencies { provided 'javax.servlet:jsp-api:2.0', 'javax.servlet:servlet-api:2.5' - testRuntime "taglibs:standard:$jstlVersion" + testRuntime "javax.servlet:jstl:$jstlVersion" } \ No newline at end of file