This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 0411175d0 CAY-2905 Upgrade Gradle to 8.14
0411175d0 is described below
commit 0411175d0d45841f9dda83ede324976fbe5b8ac7
Author: Nikita Timofeev <[email protected]>
AuthorDate: Wed Nov 5 18:50:57 2025 +0400
CAY-2905 Upgrade Gradle to 8.14
---
RELEASE-NOTES.txt | 1 +
cayenne-gradle-plugin/build.gradle | 6 +++---
.../gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
cayenne-gradle-plugin/gradlew | 4 ++--
cayenne-gradle-plugin/gradlew.bat | 4 ++--
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e434f9e55..54c92d9a3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -18,6 +18,7 @@ CAY-2873 Change Orderings.orderedList() to accept a
Collection rather than a Lis
CAY-2884 Upgrade gradle to 8.13
CAY-2893 Update velocity-engine-core dependency
CAY-2897 Add no-op default implementations to the GraphChangeHandler interface
+CAY-2905 Upgrade Gradle to 8.14
Bug Fixes:
diff --git a/cayenne-gradle-plugin/build.gradle
b/cayenne-gradle-plugin/build.gradle
index 5e2f8ba82..88cc49ccf 100644
--- a/cayenne-gradle-plugin/build.gradle
+++ b/cayenne-gradle-plugin/build.gradle
@@ -46,14 +46,14 @@ dependencies {
def projectVersion = getProjectVersion()
-group 'org.apache.cayenne.plugins'
-version projectVersion
+group = 'org.apache.cayenne.plugins'
+version = projectVersion
def cayenneVersion = version
def getProjectVersion() {
def pomFile = file('pom.xml')
if (pomFile.file) {
- def pom = new XmlSlurper().parseText(file('pom.xml').text)
+ def pom = new groovy.xml.XmlSlurper().parseText(file('pom.xml').text)
def pomVersion = pom.parent.version
return pomVersion
}
diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar
b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c7..1b33c55ba 100644
Binary files a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar and
b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index bc93d83c6..7da9bf257 100644
--- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -15,7 +15,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/cayenne-gradle-plugin/gradlew b/cayenne-gradle-plugin/gradlew
index faf93008b..23d15a936 100755
--- a/cayenne-gradle-plugin/gradlew
+++ b/cayenne-gradle-plugin/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/cayenne-gradle-plugin/gradlew.bat
b/cayenne-gradle-plugin/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/cayenne-gradle-plugin/gradlew.bat
+++ b/cayenne-gradle-plugin/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%"
org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS%
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar
"%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
