aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2023-02-22 20:31:47 +0000
committerPJ Fanning <fanningpj@apache.org>2023-02-22 20:31:47 +0000
commit916e33285b0f1b9103b6b0784fa43c9c13162833 (patch)
tree779a56edf8db42c26aef7542a85ed68279acbd57
parent729e012804f92f4db5f1d3e14eca62982f39d298 (diff)
downloadpoi-916e33285b0f1b9103b6b0784fa43c9c13162833.tar.gz
poi-916e33285b0f1b9103b6b0784fa43c9c13162833.zip
try to fix gradle issues
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1907809 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.gradle8
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--poi-integration/build.gradle4
-rw-r--r--poi-ooxml-lite-agent/build.gradle4
-rw-r--r--poi-ooxml-lite/build.gradle4
5 files changed, 11 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle
index 2e8a4b6919..e4fd3f4d2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,8 +182,8 @@ subprojects {
java {
toolchain {
- languageVersion.set(JavaLanguageVersion.of(jdkVersion))
- if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
+ if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
withJavadocJar()
withSourcesJar()
@@ -268,8 +268,8 @@ subprojects {
}
javaLauncher = javaToolchains.launcherFor {
- languageVersion.set(JavaLanguageVersion.of(jdkVersion))
- if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
+ if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
// Exclude some tests that are not actually tests or do not run cleanly on purpose
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc10b601f7..f398c33c4b 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-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 4941a232d7..e943c288f5 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -92,8 +92,8 @@ final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlfor
java {
toolchain {
- languageVersion.set(JavaLanguageVersion.of(jdkVersion))
- if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
+ if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
}
diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle
index 603bd1ce06..87111ab19d 100644
--- a/poi-ooxml-lite-agent/build.gradle
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -31,8 +31,8 @@ final MODULE_NAME = 'org.apache.poi.ooxml_lite'
java {
toolchain {
- languageVersion.set(JavaLanguageVersion.of(jdkVersion))
- if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
+ if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
}
diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 28879d6fa5..4d0ec83c7c 100644
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -83,8 +83,8 @@ task compileOoxmlLite(type: Copy) {
java {
toolchain {
- languageVersion.set(JavaLanguageVersion.of(jdkVersion))
- if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+ languageVersion = JavaLanguageVersion.of(jdkVersion)
+ if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
}