You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/09 13:45:25 UTC

(cayenne) branch master updated (79fc26473 -> 4351c3ff6)

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

asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


    from 79fc26473 Mockito upgrade for J25 compat
     new e382c4bc8 Gradle Java 25 config
     new 4351c3ff6 J25 added back to CI/CD

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .claude/rules/cayenne-gradle-plugin/build-jdk.md                      | 4 +---
 .github/workflows/verify-deploy-on-push.yml                           | 2 +-
 .github/workflows/verify-on-pr.yml                                    | 2 +-
 .../src/test/java/org/apache/cayenne/tools/GradlePluginIT.java        | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

(cayenne) 02/02: J25 added back to CI/CD

Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 4351c3ff6b6d4573c743bbf23d524664008ab8c1
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat May 9 09:45:20 2026 -0400

    J25 added back to CI/CD
---
 .github/workflows/verify-deploy-on-push.yml | 2 +-
 .github/workflows/verify-on-pr.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/verify-deploy-on-push.yml b/.github/workflows/verify-deploy-on-push.yml
index f66f0a1d2..278d9e838 100644
--- a/.github/workflows/verify-deploy-on-push.yml
+++ b/.github/workflows/verify-deploy-on-push.yml
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        jdk: [21]
+        jdk: [21, 25]
         db-profile: [hsql, h2, derby, mysql-tc, postgres-tc, sqlserver-tc]
       fail-fast: false # finish all jobs anyway
 
diff --git a/.github/workflows/verify-on-pr.yml b/.github/workflows/verify-on-pr.yml
index 9120cdef4..f69b75ee6 100644
--- a/.github/workflows/verify-on-pr.yml
+++ b/.github/workflows/verify-on-pr.yml
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        jdk: [21]
+        jdk: [21, 25]
         db-profile: [hsql, h2, derby, mysql-tc, postgres-tc, sqlserver-tc]
       fail-fast: true

(cayenne) 01/02: Gradle Java 25 config

Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit e382c4bc87f0adfb05b5b04ae6ec11c433008290
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat May 9 09:39:16 2026 -0400

    Gradle Java 25 config
---
 .claude/rules/cayenne-gradle-plugin/build-jdk.md                      | 4 +---
 .../src/test/java/org/apache/cayenne/tools/GradlePluginIT.java        | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.claude/rules/cayenne-gradle-plugin/build-jdk.md b/.claude/rules/cayenne-gradle-plugin/build-jdk.md
index 6b9f0e34c..2824ec334 100644
--- a/.claude/rules/cayenne-gradle-plugin/build-jdk.md
+++ b/.claude/rules/cayenne-gradle-plugin/build-jdk.md
@@ -7,7 +7,5 @@ description: cayenne-gradle-plugin Gradle version compatibility
 The `cayenne-gradle-plugin` integration tests run Gradle builds via `exec-maven-plugin`.
 The Gradle version is selected in `GradlePluginIT.java` based on the running JDK:
 
-- Java >= 22 → Gradle 8.8
+- Java >= 25 → Gradle 8.12
 - Java 21 (minimum baseline) → Gradle 8.5
-
-Gradle 8.5+ supports Java 21 class files, so the full reactor build works on Java 21+.
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 5f9815124..89fe05363 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
@@ -54,8 +54,8 @@ public class GradlePluginIT extends BaseTaskIT {
         String[] versions;
 
         int javaMajorVersion = getJavaMajorVersion(System.getProperty("java.version"));
-        if(javaMajorVersion >= 22) {
-            versions = new String[]{"8.8"};
+        if(javaMajorVersion >= 25) {
+            versions = new String[]{"8.12"};
         } else {
             versions = new String[]{"8.5"};
         }