diff options
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 61574 -> 61608 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rwxr-xr-x | gradlew | 4 | ||||
| -rw-r--r-- | poi-integration/build.gradle | 7 | ||||
| -rw-r--r-- | poi-ooxml-lite/build.gradle | 10 |
5 files changed, 4 insertions, 19 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 943f0cbfa7..ccebba7710 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c4b..fc10b601f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index e943c288f5..49cbc94b45 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -90,13 +90,6 @@ final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-oo final String OOXML_LITE_REPORT = '../src/resources/ooxml-lite-report' final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)" -java { - toolchain { - languageVersion = JavaLanguageVersion.of(jdkVersion) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) - } -} - task compileTest9(type: JavaCompile) { dependsOn 'compileTestJava', ':poi-ooxml:testJar', ':poi-scratchpad:testJar', ':poi-examples:jar' diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index 4d0ec83c7c..e25acb4f95 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -80,14 +80,6 @@ task compileOoxmlLite(type: Copy) { into(buildDir) } - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(jdkVersion) - if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) - } -} - compileJava { dependsOn 'compileOoxmlLite' options.fork = true @@ -169,4 +161,4 @@ cyclonedxBom { outputFormat = "all" // Exclude BOM Serial Number includeBomSerialNumber = true -}
\ No newline at end of file +} |