Gradle: Synchronize the code in the different build-scripts across the projects

No actual change in behavior expected
Mostly moved parts to make it easier to compare the build files with each other

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888791 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 19 insertions, 19 deletions

diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index ca5c05bf4c..693c913526 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -159,12 +159,29 @@ sourcesJar {
     exclude 'META-INF/services/**'
 }
 
+javadoc {
+	failOnError = true
+	doFirst {
+		options {
+			if (JavaVersion.current().isJava9Compatible()) {
+				addBooleanOption('html5', true)
+			}
+			links 'https://poi.apache.org/apidocs/dev/'
+			links 'https://docs.oracle.com/javase/8/docs/api/'
+			use = true
+			splitIndex = true
+			source = "1.8"
+			classpath += configurations.javadocs.files
+		}
+	}
+}
+
 artifacts {
     tests testJar
 }
 
 test {
-    dependsOn 'testJar'
+    dependsOn { testJar }
 
     useJUnitPlatform()
 
@@ -181,7 +198,7 @@ test {
             '-ea',
             '-Djunit.jupiter.execution.parallel.enabled=true',
             '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
-            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3',
+            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3'
             // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
         ]
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
@@ -205,23 +222,6 @@ test {
     }
 }
 
-javadoc {
-    failOnError = true
-    doFirst {
-        options {
-            if (JavaVersion.current().isJava9Compatible()) {
-                addBooleanOption('html5', true)
-            }
-            links 'https://poi.apache.org/apidocs/dev/'
-            links 'https://docs.oracle.com/javase/8/docs/api/'
-            use = true
-            splitIndex = true
-            source = "1.8"
-            classpath += configurations.javadocs.files
-        }
-    }
-}
-
 publishing {
     publications {
         POI(MavenPublication) {