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, 23 insertions, 24 deletions

diff --git a/poi/build.gradle b/poi/build.gradle
index e6ee6bde48..b5423599c8 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -77,7 +77,6 @@ java {
     withSourcesJar()
 }
 
-
 task compileJava9(type: JavaCompile) {
     dependsOn 'compileJava'
 
@@ -121,7 +120,6 @@ task cacheTest9(type: Copy) {
     into(TEST9_SRC)
 }
 
-
 jar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
@@ -163,8 +161,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()
 
@@ -191,6 +210,7 @@ test {
                 '--illegal-access=warn',
 
                 '--add-modules', MODULE_NAME,
+
                 // see https://github.com/java9-modularity/gradle-modules-plugin/issues/97
                 // opposed to the recommendation there, it doesn't work to add ... to the dependencies
                 // testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.7.1'
@@ -204,27 +224,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
-        }
-    }
-}
-
-artifacts {
-    tests testJar
-}
-
 publishing {
     publications {
         POI(MavenPublication) {