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:39 UTC
[cayenne] branch STABLE-4.1 updated (12b7107 -> e726355)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from 12b7107 Remove gradle-related binary files from the sources assembly
new f5fc61d СAY-2721 Platform builds of CayenneModeler don't work with Java 17 - update japp-maven-plugin to 3.3
new 91598c7 CAY-2711 JDK 17 compatibility - fix javadoc options
new e726355 CAY-2721 Platform builds of CayenneModeler don't work with Java 17
The 3 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:
RELEASE-NOTES.txt | 1 +
modeler/cayenne-modeler-mac/pom.xml | 6 ++++--
modeler/cayenne-modeler-win/pom.xml | 6 ++++--
pom.xml | 15 ++++++++++++---
4 files changed, 21 insertions(+), 7 deletions(-)
[cayenne] 01/03: СAY-2721 Platform builds of CayenneModeler don't work with Java 17 - update japp-maven-plugin to 3.3
Posted by nt...@apache.org.
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>
[cayenne] 02/03: CAY-2711 JDK 17 compatibility - fix javadoc options
Posted by nt...@apache.org.
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 91598c78045ac15e61e5b9251d0133a0e84e94cc
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Nov 19 11:12:38 2021 +0300
CAY-2711 JDK 17 compatibility
- fix javadoc options
(cherry picked from commit f1bc36cfb52ba4fa11b029a28cdce8e02833eca1)
---
pom.xml | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3b3bfa9..7e7a4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1728,14 +1728,23 @@
</properties>
</profile>
<profile>
- <id>java9-javadoc-html5</id>
+ <id>java9-javadoc-html5-no-modules</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,14)</jdk>
</activation>
<properties>
<javadoc.additionalOptions>-html5 --no-module-directories</javadoc.additionalOptions>
</properties>
</profile>
+ <profile>
+ <id>java14-javadoc-html5</id>
+ <activation>
+ <jdk>[14,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.additionalOptions>-html5</javadoc.additionalOptions>
+ </properties>
+ </profile>
</profiles>
<reporting>
[cayenne] 03/03: CAY-2721 Platform builds of CayenneModeler don't work with Java 17
Posted by nt...@apache.org.
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 e7263557ada45fa69f9e2622a9eab694eff9da1d
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Nov 19 11:13:25 2021 +0300
CAY-2721 Platform builds of CayenneModeler don't work with Java 17
---
RELEASE-NOTES.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index fcebac8..246675d 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -24,6 +24,7 @@ CAY-2690 dbimport skips length changes for BINARY and VARBINARY columns
CAY-2691 MySQL driver 8.0.x stores LocalDateTime differently than 5.1.x
CAY-2698 EventSubject.getSubject() is not thread safe
CAY-2702 Modeler: Callbacks table has too small default width
+CAY-2721 Platform builds of CayenneModeler don't work with Java 17
----------------------------------
Release: 4.1