Browse Source

Minor sample build changes. JSTL dependency update.

Luke Taylor 15 years ago
parent
commit
a681dee0e1

+ 1 - 1
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'

+ 4 - 0
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"
 }

+ 1 - 1
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... -"

+ 4 - 0
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"
 }

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