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
The following commit(s) were added to refs/heads/master by this push:
new 5cbda3bce CAY-2935 Upgrade Cayenne 5.0 to Java 21
5cbda3bce is described below
commit 5cbda3bce50e8aceb6b45bfc512d9a7350fa2e85
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sat May 9 11:42:33 2026 -0400
CAY-2935 Upgrade Cayenne 5.0 to Java 21
upgrading native Modeler assemblies
---
modeler/cayenne-modeler-mac/pom.xml | 4 +---
modeler/cayenne-modeler-win/pom.xml | 6 ++----
pom.xml | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/modeler/cayenne-modeler-mac/pom.xml
b/modeler/cayenne-modeler-mac/pom.xml
index b425c42f6..78c6521cc 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -81,10 +81,8 @@
<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
- <jvm0>1.8</jvm0>
+ <jvm0>21</jvm0>
<jvm0Options>-Xmx500m
-Dapple.laf.useScreenMenuBar=true</jvm0Options>
- <jvm1>17</jvm1>
- <jvm1Options>-Xmx500m
-Dapple.laf.useScreenMenuBar=true --add-exports
java.desktop/com.apple.eawt=ALL-UNNAMED</jvm1Options>
</configuration>
<executions>
<execution>
diff --git a/modeler/cayenne-modeler-win/pom.xml
b/modeler/cayenne-modeler-win/pom.xml
index 70b0acd65..41b390563 100644
--- a/modeler/cayenne-modeler-win/pom.xml
+++ b/modeler/cayenne-modeler-win/pom.xml
@@ -95,10 +95,8 @@
<mainClass>org.apache.cayenne.modeler.win.WinMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
- <jvm0>1.8</jvm0>
-
<jvm0Options>-Xmx500m</jvm0Options>
- <jvm1>17</jvm1>
- <jvm1Options>-Xmx500m
--add-exports
java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED</jvm1Options>
+ <jvm0>21</jvm0>
+ <jvm0Options>-Xmx500m
--add-exports
java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED</jvm0Options>
</configuration>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 8a1b70b77..d6be7b078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<apache-rat-plugin.version>0.18</apache-rat-plugin.version>
<dependency-maven-plugin.version>1.0</dependency-maven-plugin.version>
<exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
- <japp-maven-plugin.version>3.4</japp-maven-plugin.version>
+ <japp-maven-plugin.version>3.7</japp-maven-plugin.version>
<javacc-maven-plugin.version>2.6</javacc-maven-plugin.version>
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
