This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.0
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.0 by this push:
new 4eedb17f4 CAY-2793 Modeler: support for JDK 17+ for Cayenne 4.0
4eedb17f4 is described below
commit 4eedb17f47d680b89c51f823ec2714b1125e6d30
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Feb 9 17:26:11 2023 +0300
CAY-2793 Modeler: support for JDK 17+ for Cayenne 4.0
---
RELEASE-NOTES.txt | 9 +++++++++
modeler/cayenne-modeler-mac/pom.xml | 6 ++++--
modeler/cayenne-modeler-win/pom.xml | 6 ++++--
pom.xml | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 6e48ee2d4..95f75cb75 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -7,6 +7,15 @@ http://cayenne.apache.org/
To browse individual bug reports check out project issue tracker:
https://issues.apache.org/jira/browse/CAY
+----------------------------------
+Release: 4.0.3
+Date:
+----------------------------------
+
+Changes/New Features:
+
+CAY-2793 Modeler: support for JDK 17+ for Cayenne 4.0
+
----------------------------------
Release: 4.0.2
Date: October 9, 2019
diff --git a/modeler/cayenne-modeler-mac/pom.xml
b/modeler/cayenne-modeler-mac/pom.xml
index 0933f7f15..5c12ae8f7 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -103,8 +103,10 @@
<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.icns</icon>
<os>mac</os>
- <jvm>1.8+</jvm>
- <jvmOptions>-Xmx500m
-Dapple.laf.useScreenMenuBar=true</jvmOptions>
+ <jvm0>1.8</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 507d49fab..5bb821921 100644
--- a/modeler/cayenne-modeler-win/pom.xml
+++ b/modeler/cayenne-modeler-win/pom.xml
@@ -95,8 +95,10 @@
<mainClass>org.apache.cayenne.modeler.win.WinMain</mainClass>
<icon>src/japplication/resources/CayenneModeler.ico</icon>
<os>windows</os>
- <jvm>1.5+</jvm>
-
<jvmOptions>-Xmx500m</jvmOptions>
+ <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>
</configuration>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 338a9e1bb..712c69ca1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,7 +809,7 @@
<plugin>
<groupId>org.objectstyle.japp</groupId>
<artifactId>japp-maven-plugin</artifactId>
- <version>3.1</version>
+ <version>3.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
