Skip to content

Commit 5cbda3b

Browse files
committed
CAY-2935 Upgrade Cayenne 5.0 to Java 21
upgrading native Modeler assemblies
1 parent 766fc41 commit 5cbda3b

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

modeler/cayenne-modeler-mac/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@
8181
<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
8282
<icon>src/japplication/resources/CayenneModeler.icns</icon>
8383
<os>mac</os>
84-
<jvm0>1.8</jvm0>
84+
<jvm0>21</jvm0>
8585
<jvm0Options>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvm0Options>
86-
<jvm1>17</jvm1>
87-
<jvm1Options>-Xmx500m -Dapple.laf.useScreenMenuBar=true --add-exports java.desktop/com.apple.eawt=ALL-UNNAMED</jvm1Options>
8886
</configuration>
8987
<executions>
9088
<execution>

modeler/cayenne-modeler-win/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@
9595
<mainClass>org.apache.cayenne.modeler.win.WinMain</mainClass>
9696
<icon>src/japplication/resources/CayenneModeler.ico</icon>
9797
<os>windows</os>
98-
<jvm0>1.8</jvm0>
99-
<jvm0Options>-Xmx500m</jvm0Options>
100-
<jvm1>17</jvm1>
101-
<jvm1Options>-Xmx500m --add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED</jvm1Options>
98+
<jvm0>21</jvm0>
99+
<jvm0Options>-Xmx500m --add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED</jvm0Options>
102100
</configuration>
103101
<executions>
104102
<execution>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<apache-rat-plugin.version>0.18</apache-rat-plugin.version>
6868
<dependency-maven-plugin.version>1.0</dependency-maven-plugin.version>
6969
<exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
70-
<japp-maven-plugin.version>3.4</japp-maven-plugin.version>
70+
<japp-maven-plugin.version>3.7</japp-maven-plugin.version>
7171
<javacc-maven-plugin.version>2.6</javacc-maven-plugin.version>
7272
<maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
7373
<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>

0 commit comments

Comments
 (0)