Start moving some bits to the main Gradle file

Use a common definition of some constants
Gradle plugins are in the main file already anyway

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

diff --git a/build.gradle b/build.gradle
index 485313ff612f0fda88426bdc6ca13579b01b2743..2ee40a30925492c4b896a615812fc275bb46c730 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ wrapper.finalizedBy adjustWrapperPropertiesFile
  */
 allprojects {
 //    apply plugin: 'eclipse'
-    apply plugin: 'idea'
+       apply plugin: 'idea'
 }
 
 /**
@@ -107,6 +107,12 @@ subprojects {
         hamcrestVersion = '2.2'
         xmlbeansVersion = '5.0.0'
         batikVersion = '1.14'
+
+               JAVA9_SRC = 'src/main/java9'
+               JAVA9_OUT = "${buildDir}/classes/java9/main/"
+               TEST9_SRC = 'src/test/java9'
+               TEST9_OUT = "${buildDir}/classes/java9/test/"
+               VERSIONS9 = 'META-INF/versions/9'
     }
 
     tasks.withType(JavaCompile) {

diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 8a2b26f7178e857c227df1bd7ba3e86d67e411b2..21bb62e598c036bf19bfb198e37a2d114f63de5f 100644 (file)
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -17,16 +17,6 @@
 
 import java.util.regex.Pattern
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
 sourceSets {
     main {
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 5dea6d7b2d4a1386fab898f6f040ffe87481bcfb..7d31dc74bcdf93bf1f6406ab7feba509bd21ee84 100644 (file)
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -17,18 +17,6 @@
 
 import java.util.regex.Pattern
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
 configurations {
        tests
 }

diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index d79da73deb36a1833a0af2638bee27c73372c3ef..ea1804a30bfdfe0928d8b6b760ccaed6825e6d8f 100644 (file)
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -17,17 +17,7 @@ import java.util.regex.Pattern
    limitations under the License.
 ==================================================================== */
 
-
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
 final String MODULE_NAME = 'org.apache.poi.ooxml.schemas'
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
 final String BEANS_SRC = "${buildDir}/generated-sources"
 final String BEANS_RES = "${buildDir}/generated-resources"
 

diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle
index 7b9204c8f3f2b68bce04d6cd9071d2744d277915..fc0cf7b2df5a0cf5458b1e24ad087e4b768e01d3 100644 (file)
--- a/poi-ooxml-lite-agent/build.gradle
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -15,16 +15,6 @@
    limitations under the License.
 ==================================================================== */
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
 sourceSets {
     main {
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {

diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 8dd452f5eb82fd4eb4d522c762f24833fdedb77c..485f572c62a10f303abfc505d5a407a57835ee37 100644 (file)
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -19,15 +19,6 @@ import java.util.stream.Collectors
    limitations under the License.
 ==================================================================== */
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String VERSIONS9 = 'META-INF/versions/9'
 final String BEANS_SRC = "${buildDir}/generated-sources"
 final String BEANS_RES = "${buildDir}/generated-resources"
 

diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index e801ed89aa0c0a864a08a186841f78064d0f5ea6..fcc8d79470f615210fbb6d430a64b8ca3fdbd723 100644 (file)
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -17,18 +17,6 @@
 
 import java.util.regex.Pattern
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-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'

diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index 693c913526e3503f6984cda085a3931c08ed61b8..4669dc98dce384d5e453131f96ba300b40439e08 100644 (file)
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -17,18 +17,6 @@ import java.util.regex.Pattern
    limitations under the License.
 ==================================================================== */
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
 configurations {
     tests
     javadocs

diff --git a/poi/build.gradle b/poi/build.gradle
index b5423599c824a0188299beb49f546e288bc114d7..d4388eebfc3af3b86bf3e3e5697c50c637faa29c 100644 (file)
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -17,18 +17,6 @@
 
 import java.util.regex.Pattern
 
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'java-library'
-}
-
-final String JAVA9_SRC = 'src/main/java9'
-final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
-final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = "${buildDir}/classes/java9/test/"
-final String VERSIONS9 = 'META-INF/versions/9'
-
 configurations {
     tests
     javadocs