(cayenne) branch STABLE-4.2 updated: CAY-2856 Upgrade Gradle to 8.8

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.2
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/STABLE-4.2 by this push:
     new 53c5e8f51 CAY-2856 Upgrade Gradle to 8.8
53c5e8f51 is described below

commit 53c5e8f51dcd0daa22fbf98657ac8bbbe933ce37
Author: stariy95 <stari...@gmail.com>
AuthorDate: Wed Dec 6 19:06:17 2023 +0400

    CAY-2856 Upgrade Gradle to 8.8
---
 RELEASE-NOTES.txt                                                   | 1 +
 cayenne-gradle-plugin/build.gradle                                  | 4 ++--
 cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties      | 2 +-
 .../src/test/java/org/apache/cayenne/tools/GradlePluginIT.java      | 6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 579fa85b1..d35334dcf 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,6 +15,7 @@ Changes/New Features:
 
 CAY-2849 Switch documentation to `hugo-asciidoctorj-extension`
 CAY-2852 Update velocity-engine-core dependency
+CAY-2856 Upgrade Gradle to 8.8
 
 Bug Fixes:
 
diff --git a/cayenne-gradle-plugin/build.gradle 
b/cayenne-gradle-plugin/build.gradle
index 656c39c82..281738dbc 100644
--- a/cayenne-gradle-plugin/build.gradle
+++ b/cayenne-gradle-plugin/build.gradle
@@ -75,12 +75,12 @@ task licenseFiles(type: Copy) {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc.destinationDir
 }
 
diff --git a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties 
b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index edd4bfca5..2a12e78e6 100644
--- a/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/cayenne-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
index c9ea501a9..3f4e0f74b 100644
--- 
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
+++ 
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java
@@ -56,7 +56,11 @@ public class GradlePluginIT extends BaseTaskIT {
 
         // Old gradle versions will fail on new JDK
         int javaMajorVersion = 
getJavaMajorVersion(System.getProperty("java.version"));
-        if(javaMajorVersion >= 19) {
+        if(javaMajorVersion >= 22) {
+            versions = new String[]{"8.8"};
+        } else if(javaMajorVersion >= 21) {
+            versions = new String[]{"8.5"};
+        } else if(javaMajorVersion >= 19) {
             versions = new String[]{"7.6"};
         } else if(javaMajorVersion >= 17) {
             versions = new String[]{"7.3"};