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
This commit is contained in:
Dominik Stadler 2021-05-13 12:11:35 +00:00
parent 0e8f4e3634
commit 41ff8bb20c
9 changed files with 7 additions and 88 deletions

View File

@ -107,6 +107,12 @@ subprojects {
hamcrestVersion = '2.2' hamcrestVersion = '2.2'
xmlbeansVersion = '5.0.0' xmlbeansVersion = '5.0.0'
batikVersion = '1.14' 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) { tasks.withType(JavaCompile) {

View File

@ -17,16 +17,6 @@
import java.util.regex.Pattern 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 { sourceSets {
main { main {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) { if (JavaVersion.current() != JavaVersion.VERSION_1_8) {

View File

@ -17,18 +17,6 @@
import java.util.regex.Pattern 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 { configurations {
tests tests
} }

View File

@ -17,17 +17,7 @@ import java.util.regex.Pattern
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
plugins {
id 'java'
id 'maven-publish'
id 'java-library'
}
final String MODULE_NAME = 'org.apache.poi.ooxml.schemas' 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_SRC = "${buildDir}/generated-sources"
final String BEANS_RES = "${buildDir}/generated-resources" final String BEANS_RES = "${buildDir}/generated-resources"

View File

@ -15,16 +15,6 @@
limitations under the License. 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 { sourceSets {
main { main {
if (JavaVersion.current() != JavaVersion.VERSION_1_8) { if (JavaVersion.current() != JavaVersion.VERSION_1_8) {

View File

@ -19,15 +19,6 @@ import java.util.stream.Collectors
limitations under the License. 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_SRC = "${buildDir}/generated-sources"
final String BEANS_RES = "${buildDir}/generated-resources" final String BEANS_RES = "${buildDir}/generated-resources"

View File

@ -17,18 +17,6 @@
import java.util.regex.Pattern 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 { configurations {
all { all {
exclude group: 'xalan', module: 'xalan' exclude group: 'xalan', module: 'xalan'

View File

@ -17,18 +17,6 @@ import java.util.regex.Pattern
limitations under the License. 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 { configurations {
tests tests
javadocs javadocs

View File

@ -17,18 +17,6 @@
import java.util.regex.Pattern 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 { configurations {
tests tests
javadocs javadocs