fix build failure, use optional in the correct way

mfatihercik · Feb 28, 2015 · 13efb53 · 13efb53
1 parent 27e6ed1
commit 13efb53
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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")