Author: fanningpj
Date: Sun Mar 19 20:40:14 2023
New Revision: 1908529
URL: http://svn.apache.org/viewvc?rev=1908529&view=rev
Log:
remove temporary hacks
Modified:
poi/trunk/poi-examples/build.gradle
poi/trunk/poi-excelant/build.gradle
poi/trunk/poi-integration/build.gradle
poi/trunk/poi-ooxml-full/build.gradle
poi/trunk/poi-ooxml-lite-agent/build.gradle
poi/trunk/poi-ooxml-lite/build.gradle
poi/trunk/poi-ooxml/build.gradle
poi/trunk/poi-scratchpad/build.gradle
poi/trunk/poi/build.gradle
Modified: poi/trunk/poi-examples/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-examples/build.gradle (original)
+++ poi/trunk/poi-examples/build.gradle Sun Mar 19 20:40:14 2023
@@ -51,7 +51,6 @@ final List MODULE_COMPILE_PATH = sourceS
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
Modified: poi/trunk/poi-excelant/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Sun Mar 19 20:40:14 2023
@@ -59,7 +59,6 @@ final String OOXML_LITE_INCLUDES = "^(co
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
@@ -77,7 +76,6 @@ task compileJava9(type: JavaCompile) {
task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
@@ -140,7 +138,6 @@ artifacts {
test {
dependsOn { testJar }
- onlyIf { jdkVersion > 8 } // unfortunately, Java 8 builds on
https://ci-builds.apache.org/ are hanging
doFirst {
jvmArgs += [
Modified: poi/trunk/poi-integration/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-integration/build.gradle (original)
+++ poi/trunk/poi-integration/build.gradle Sun Mar 19 20:40:14 2023
@@ -92,7 +92,6 @@ final String OOXML_LITE_INCLUDES = "^(co
task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi-ooxml:testJar',
':poi-scratchpad:testJar', ':poi-examples:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
Modified: poi/trunk/poi-ooxml-full/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-full/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-full/build.gradle (original)
+++ poi/trunk/poi-ooxml-full/build.gradle Sun Mar 19 20:40:14 2023
@@ -56,7 +56,6 @@ compileJava {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
Modified: poi/trunk/poi-ooxml-lite-agent/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite-agent/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite-agent/build.gradle Sun Mar 19 20:40:14 2023
@@ -38,7 +38,6 @@ java {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
Modified: poi/trunk/poi-ooxml-lite/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite/build.gradle Sun Mar 19 20:40:14 2023
@@ -90,7 +90,6 @@ processResources.dependsOn 'compileOoxml
sourcesJar.dependsOn 'compileOoxmlLite'
task compileJava9(type: JavaCompile, dependsOn: 'compileJava') {
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
}
Modified: poi/trunk/poi-ooxml/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Sun Mar 19 20:40:14 2023
@@ -152,7 +152,6 @@ compileJava {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
@@ -170,7 +169,6 @@ task compileJava9(type: JavaCompile) {
task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi:testJar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
@@ -266,8 +264,6 @@ artifacts {
}
test {
- onlyIf { jdkVersion > 8 } // unfortunately, Java 8 builds on
https://ci-builds.apache.org/ are hanging
-
// for some reason catching the OOM does not work when run from Gradle
exclude '**/MemoryUsage.class'
Modified: poi/trunk/poi-scratchpad/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/build.gradle (original)
+++ poi/trunk/poi-scratchpad/build.gradle Sun Mar 19 20:40:14 2023
@@ -55,7 +55,6 @@ final List TEST_MODULE_PATH = sourceSets
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
@@ -73,7 +72,6 @@ task compileJava9(type: JavaCompile) {
task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi:jar'
- onlyIf {jdkVersion > 8}
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
Modified: poi/trunk/poi/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1908529&r1=1908528&r2=1908529&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Sun Mar 19 20:40:14 2023
@@ -97,7 +97,6 @@ task compileJava9(type: JavaCompile) {
'--module-path', sourceSets.main.compileClasspath.asPath
]
}
-compileJava9.onlyIf {jdkVersion > 8}
task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava'
@@ -115,7 +114,6 @@ task compileTest9(type: JavaCompile) {
]
classpath = files()
}
-compileTest9.onlyIf {jdkVersion > 8}
jar {
dependsOn compileJava9
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
