fix for GRAILS-4742 "ClassNotFoundException when using ServletAPI 2.5 (jstl.jar problem)"

Author: graemerocher

src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy

@@ -256,8 +256,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
 
                 // dependencies needed during development, but not for deployment
                 provided "javax.servlet:servlet-api:2.5",
-                         "javax.servlet:jsp-api:2.1",
-                         "javax.servlet:jstl:1.1.2"
+                         "javax.servlet:jsp-api:2.1"
 
                 // dependencies needed for compilation
                 compile("org.codehaus.groovy:groovy-all:1.6.7") {
@@ -315,7 +314,8 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
                         "org.aspectj:aspectjrt:1.6.6",
                         "cglib:cglib-nodep:2.1_3",
                         "commons-fileupload:commons-fileupload:1.2.1",
-                        "oro:oro:2.0.8"
+                        "oro:oro:2.0.8",
+                        "javax.servlet:jstl:1.1.2"
 
                 // data source
                 runtime "commons-dbcp:commons-dbcp:1.2.2",

src/test/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy

@@ -387,10 +387,10 @@ public class IvyDependencyManagerTests extends GroovyTestCase{
         def grailsVersion = getCurrentGrailsVersion()
         manager.parseDependencies(IvyDependencyManager.getDefaultDependencies(grailsVersion))
 
-        assertEquals 52, manager.listDependencies('runtime').size()
-        assertEquals 55, manager.listDependencies('test').size()
+        assertEquals 53, manager.listDependencies('runtime').size()
+        assertEquals 56, manager.listDependencies('test').size()
         assertEquals 18, manager.listDependencies('build').size()
-        assertEquals 3, manager.listDependencies('provided').size()
+        assertEquals 2, manager.listDependencies('provided').size()
 
         // This should be a functional test since it relies on the Grails
         // JAR files being built. It also runs Ivy, which isn't ideal