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, 13 insertions, 14 deletions

diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 9f67a73103..69884f7221 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -29,6 +29,18 @@ final String TEST9_SRC = 'src/test/java9'
 final String TEST9_OUT = "${buildDir}/classes/java9/test/"
 final String VERSIONS9 = 'META-INF/versions/9'
 
+configurations {
+	all {
+		exclude group: 'xalan', module: 'xalan'
+		if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+			exclude group: 'xml-apis', module: 'xml-apis'
+		}
+	}
+	broken
+	tests
+    javadocs
+}
+
 sourceSets {
     main {
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
@@ -42,18 +54,6 @@ sourceSets {
     }
 }
 
-configurations {
-    all {
-        exclude group: 'xalan', module: 'xalan'
-        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-            exclude group: 'xml-apis', module: 'xml-apis'
-        }
-    }
-    broken
-    tests
-    javadocs
-}
-
 dependencies {
     api project(':poi')
     api project(':poi-ooxml-full')
@@ -192,7 +192,6 @@ task testJar(type: Jar, dependsOn: testClasses) {
     }
 }
 
-
 sourcesJar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
     exclude 'META-INF/services/**'
@@ -234,7 +233,7 @@ test {
     // for some reason catching the OOM does not work when run from Gradle
     exclude '**/MemoryUsage.class'
 
-    dependsOn 'testJar'
+    dependsOn { testJar }
 
     useJUnitPlatform()