You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2021/11/24 12:32:40 UTC
[cayenne] 01/03: СAY-2721 Platform builds of CayenneModeler don't work with Java 17 - update japp-maven-plugin to 3.3
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit f5fc61d0e9bbbeebb900e7c74ce23ef3035a92e9
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Nov 18 16:47:36 2021 +0300
СAY-2721 Platform builds of CayenneModeler don't work with Java 17
- update japp-maven-plugin to 3.3
(cherry picked from commit be8261e15ba8b15c48c2626f5bb82ce946662a34)
---
modeler/cayenne-modeler-mac/pom.xml | 6 ++++--
modeler/cayenne-modeler-win/pom.xml | 6 ++++--
pom.xml | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
index 1df9bb1..ff8b366 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 00c8466..20fdd15 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 c7f60ad..3b3bfa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -831,7 +831,7 @@
<plugin>
<groupId>org.objectstyle.japp</groupId>
<artifactId>japp-maven-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>