Merge pull request Netflix#263 from codewise-com/master

Skipping doclint if building with Java 8. It breaks the build due to err...
linckham · Nov 21, 2014 · 671263c · 671263c
2 parents 564009b + 1691f26
commit 671263c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -44,6 +44,13 @@ subprojects {
     }
 }
 
+if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+        }
+    }
+}
 
 project(':eureka-client') {
     dependencies {

diff --git a/gradle/convention.gradle b/gradle/convention.gradle
@@ -68,7 +68,7 @@ apply plugin: 'github-pages' // Used to create publishGhPages task
 
 def docTasks = [:]
 [Javadoc,ScalaDoc,Groovydoc].each{ Class docClass ->
-    def allSources = allprojects.tasks*.withType(docClass).flatten()*.source 
+    def allSources = allprojects.tasks*.withType(docClass).flatten()*.source
     if (allSources) {
         def shortName = docClass.simpleName.toLowerCase()
         def docTask = task "aggregate${shortName.capitalize()}"(type: docClass, description: "Aggregate subproject ${shortName}s") {