From 13efb531ce07f4ad78c9edb4a0058ac4e4566a0a Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@pivotal.io>
Date: Fri, 27 Feb 2015 19:26:06 -0500
Subject: [PATCH] fix build failure, use optional in the correct way

---
 grails-bom/build.gradle          | 6 ++----
 grails-console/build.gradle      | 6 ++----
 grails-dependencies/build.gradle | 6 ++----
 grails-web/build.gradle          | 5 +----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
index fce8d43f3b7..9065c24a1a4 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/build.gradle
@@ -55,8 +55,8 @@ publishing {
                             mkp.name 'Jeff Brown'
                         }
                         mkp.developer {
-                            mkp.id 'burtbeckwith'
-                            mkp.name 'Burt Beckwith'
+                            mkp.id 'lhotari'
+                            mkp.name 'Lari Hotari'
                         }
                     }
 
@@ -165,5 +165,3 @@ bintray {
         }
     }
 }
-
-
diff --git a/grails-console/build.gradle b/grails-console/build.gradle
index 38124f40c7c..a9fc03576b1 100644
--- a/grails-console/build.gradle
+++ b/grails-console/build.gradle
@@ -9,9 +9,7 @@ dependencies {
     compile("org.springframework.boot:spring-boot:$springBootVersion")
     compile "org.springframework:spring-test:${springVersion}"
 
-    provided "org.springframework:spring-web:${springVersion}"
-    optional "org.springframework:spring-web:${springVersion}"
+    compile "org.springframework:spring-web:${springVersion}", optional
 
-    provided "javax.servlet:javax.servlet-api:$servletApiVersion"
-    optional "javax.servlet:javax.servlet-api:$servletApiVersion"
+    compile "javax.servlet:javax.servlet-api:$servletApiVersion", optional
 }
diff --git a/grails-dependencies/build.gradle b/grails-dependencies/build.gradle
index 83793fb0423..a7f584f2089 100644
--- a/grails-dependencies/build.gradle
+++ b/grails-dependencies/build.gradle
@@ -52,8 +52,8 @@ publishing {
                             delegate.name 'Jeff Brown'
                         }
                         delegate.developer {
-                            delegate.id 'burtbeckwith'
-                            delegate.name 'Burt Beckwith'
+                            delegate.id 'lhotari'
+                            delegate.name 'Lari Hotari'
                         }
                     }
 
@@ -162,5 +162,3 @@ bintray {
         }
     }
 }
-
-
diff --git a/grails-web/build.gradle b/grails-web/build.gradle
index b9efc4373dd..942ebc39d6b 100644
--- a/grails-web/build.gradle
+++ b/grails-web/build.gradle
@@ -1,11 +1,8 @@
-configurations {
-    optional
-}
 dependencies {
     compile project(":grails-web-common")
     compile project(":grails-web-gsp")
     compile project(":grails-web-databinding")
-    provided project(":grails-web-fileupload")
+    compile project(":grails-web-fileupload"), optional
     compile project(":grails-web-url-mappings")
     compile project(":grails-web-jsp")
     compile project(":grails-web-mvc")