cayenne git commit: CAY-2253 Cayenne JDK9 compatibility - backport of changes made for 4.1 branch - fix imports to deal with java.lang.Module class conflict
Repository: cayenne Updated Branches: refs/heads/STABLE-4.0 522d45811 -> 859f459c2 CAY-2253 Cayenne JDK9 compatibility - backport of changes made for 4.1 branch - fix imports to deal with java.lang.Module class conflict Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/859f459c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/859f459c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/859f459c Branch: refs/heads/STABLE-4.0 Commit: 859f459c2019d14867fce4ca010aaa674cd49701 Parents: 522d458 Author: Nikita Timofeev Authored: Wed Oct 4 15:04:27 2017 +0300 Committer: Nikita Timofeev Committed: Wed Oct 4 15:04:27 2017 +0300 -- .../upgrade/v7/ProjectUpgrader_V7Test.java | 7 +- .../upgrade/v8/ProjectUpgrader_V8Test.java | 7 +- .../upgrade/v9/ProjectUpgrader_V9Test.java | 7 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../modeler/osx/OSXApplicationWrapper.java | 154 +++ .../modeler/osx/OSXPlatformInitializer.java | 25 ++- .../cayenne/modeler/osx/OSXQuitHandler.java | 29 .../modeler/osx/OSXQuitResponseWrapper.java | 73 + .../components/image/FilteredIconFactory.java | 5 +- pom.xml | 12 +- 10 files changed, 294 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cayenne/blob/859f459c/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java -- diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java index 8dd51a2..9b3cf4f 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java @@ -24,7 +24,12 @@ import org.apache.cayenne.configuration.DefaultConfigurationNameMapper; import org.apache.cayenne.configuration.XMLDataMapLoader; import org.apache.cayenne.configuration.server.JNDIDataSourceFactory; import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory; -import org.apache.cayenne.di.*; +import org.apache.cayenne.di.AdhocObjectFactory; +import org.apache.cayenne.di.Binder; +import org.apache.cayenne.di.Module; +import org.apache.cayenne.di.ClassLoaderManager; +import org.apache.cayenne.di.DIBootstrap; +import org.apache.cayenne.di.Injector; import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory; import org.apache.cayenne.di.spi.DefaultClassLoaderManager; import org.apache.cayenne.project.FileProjectSaver; http://git-wip-us.apache.org/repos/asf/cayenne/blob/859f459c/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java -- diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java index 610d77c..139495e 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java @@ -23,7 +23,12 @@ import org.apache.cayenne.configuration.ConfigurationNameMapper; import org.apache.cayenne.configuration.DataMapLoader; import org.apache.cayenne.configuration.DefaultConfigurationNameMapper; import org.apache.cayenne.configuration.XMLDataMapLoader; -import org.apache.cayenne.di.*; +import org.apache.cayenne.di.AdhocObjectFactory; +import org.apache.cayenne.di.Binder; +import org.apache.cayenne.di.Module; +import org.apache.cayenne.di.ClassLoaderManager; +import org.apache.cayenne.di.DIBootstrap; +import org.apache.cayenne.di.Injector; import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory; import org.apache.cayenne.di.spi.DefaultClassLoaderManager; import org.apache.cayenne.project.FileProjectSaver; http://git-wip-us.apache.org/repos/asf/cayenne/blob/859f459c/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v9/ProjectUpgrader_V9Test.java -- diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v9/ProjectUpgrader_V9Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v9/ProjectUpgrader_V9Test.java index 3851a2e..b0ecf0b 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v9/ProjectUpgrader_V9Test.java +++ b/cayenne-project/src/test/java/org
[jira] [Updated] (CAY-2200) Update DB2 support. Many tests cases are failing now.
[ https://issues.apache.org/jira/browse/CAY-2200?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] ASF GitHub Bot updated CAY-2200: Labels: pull-request-available (was: ) > Update DB2 support. Many tests cases are failing now. > - > > Key: CAY-2200 > URL: https://issues.apache.org/jira/browse/CAY-2200 > Project: Cayenne > Issue Type: Task > Components: Database integration >Affects Versions: 4.0.M5 >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Minor > Labels: pull-request-available > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CAY-2200) Update DB2 support. Many tests cases are failing now.
[ https://issues.apache.org/jira/browse/CAY-2200?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16190925#comment-16190925 ] ASF GitHub Bot commented on CAY-2200: - GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/244 CAY-2200 Update DB2 support. Many tests cases are failing now. You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2200UnitTests Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/244.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #244 commit f43de6a7e6533efd6bcac8f9c55324754496c6b1 Author: Arseni Bulatski Date: 2017-10-04T07:39:37Z CAY-2200 Update DB2 support. Many tests cases are failing now. > Update DB2 support. Many tests cases are failing now. > - > > Key: CAY-2200 > URL: https://issues.apache.org/jira/browse/CAY-2200 > Project: Cayenne > Issue Type: Task > Components: Database integration >Affects Versions: 4.0.M5 >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Minor > Labels: pull-request-available > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[GitHub] cayenne pull request #244: CAY-2200 Update DB2 support. Many tests cases are...
GitHub user aarrsseni opened a pull request: https://github.com/apache/cayenne/pull/244 CAY-2200 Update DB2 support. Many tests cases are failing now. You can merge this pull request into a Git repository by running: $ git pull https://github.com/aarrsseni/cayenne CAY-2200UnitTests Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cayenne/pull/244.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #244 commit f43de6a7e6533efd6bcac8f9c55324754496c6b1 Author: Arseni Bulatski Date: 2017-10-04T07:39:37Z CAY-2200 Update DB2 support. Many tests cases are failing now. ---
[jira] [Commented] (CAY-2253) Cayenne JDK9 compatibility
[ https://issues.apache.org/jira/browse/CAY-2253?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16190915#comment-16190915 ] Nikita Timofeev commented on CAY-2253: -- *4.1* branch compiles and passes all tests on Java 9, Generic and MacOS versions of Modeler are functional. > Cayenne JDK9 compatibility > -- > > Key: CAY-2253 > URL: https://issues.apache.org/jira/browse/CAY-2253 > Project: Cayenne > Issue Type: Task >Affects Versions: 4.0.M5 > Environment: Java 9 >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev > Fix For: 4.0.B3, 4.1.M1 > > > # All tests that validate di.spi.ModuleProvider presence fail as > ServiceLoader loads 2 providers instead of 1. > # *cayenne-server* > All tests related to hessian serialization are in error. > # *cayenne-client* > All tests related to hessian serialization are in error. > {quote}Unable to make private java.lang.StackTraceElement() accessible: > module java.base does not "opens java.lang" to unnamed module{quote} > # *cayenne-crypto* > javax.xml.bind.DatatypeConverter moved to a module that is not loaded by > default > see http://mail.openjdk.java.net/pipermail/jdk9-dev/2016-May/004309.html > {quote} > Caused by: java.lang.ClassNotFoundException: > javax.xml.bind.DatatypeConverter > at > java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:533) > at > java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:186) > at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:476) > ... 32 more > {quote} > # *cayenne-protostuff* > All tests related to protostuff serialization are in error. > {quote}Caused by: java.lang.reflect.InaccessibleObjectException: Unable to > make field private final java.lang.Object > java.util.Collections$SingletonSet.element accessible: module java.base does > not "opens java.util" to unnamed module{quote} > # *cayenne-doc* > Not really understood why this module is failing > # *tutorial-rop-server* > Seems that maven-war-plugin (3.0.0) is not compatible: > {quote} > [ERROR] Failed to execute goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war (default-war) on project > tutorial-rop-server: Execution default-war of goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war failed: Unable to load > the mojo 'war' in the plugin > 'org.apache.maven.plugins:maven-war-plugin:3.0.0' due to an API > incompatibility: > org.codehaus.plexus.component.repository.exception.ComponentLookupException: > null > ... > [ERROR] -: > ExceptionInInitializerError: Unable to make field private final > java.util.Comparator java.util.TreeMap.comparator accessible: module > java.base does not "opens java.util" to unnamed module @7f51f588 > [ERROR] -> [Help 1]{quote} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (CAY-2253) Cayenne JDK9 compatibility
[ https://issues.apache.org/jira/browse/CAY-2253?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2253: - Fix Version/s: 4.1.M1 4.0.B3 > Cayenne JDK9 compatibility > -- > > Key: CAY-2253 > URL: https://issues.apache.org/jira/browse/CAY-2253 > Project: Cayenne > Issue Type: Task >Affects Versions: 4.0.M5 > Environment: Java build 9-ea+158 >Reporter: Nikita Timofeev > Fix For: 4.0.B3, 4.1.M1 > > > # All tests that validate di.spi.ModuleProvider presence fail as > ServiceLoader loads 2 providers instead of 1. > # *cayenne-server* > All tests related to hessian serialization are in error. > # *cayenne-client* > All tests related to hessian serialization are in error. > {quote}Unable to make private java.lang.StackTraceElement() accessible: > module java.base does not "opens java.lang" to unnamed module{quote} > # *cayenne-crypto* > javax.xml.bind.DatatypeConverter moved to a module that is not loaded by > default > see http://mail.openjdk.java.net/pipermail/jdk9-dev/2016-May/004309.html > {quote} > Caused by: java.lang.ClassNotFoundException: > javax.xml.bind.DatatypeConverter > at > java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:533) > at > java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:186) > at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:476) > ... 32 more > {quote} > # *cayenne-protostuff* > All tests related to protostuff serialization are in error. > {quote}Caused by: java.lang.reflect.InaccessibleObjectException: Unable to > make field private final java.lang.Object > java.util.Collections$SingletonSet.element accessible: module java.base does > not "opens java.util" to unnamed module{quote} > # *cayenne-doc* > Not really understood why this module is failing > # *tutorial-rop-server* > Seems that maven-war-plugin (3.0.0) is not compatible: > {quote} > [ERROR] Failed to execute goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war (default-war) on project > tutorial-rop-server: Execution default-war of goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war failed: Unable to load > the mojo 'war' in the plugin > 'org.apache.maven.plugins:maven-war-plugin:3.0.0' due to an API > incompatibility: > org.codehaus.plexus.component.repository.exception.ComponentLookupException: > null > ... > [ERROR] -: > ExceptionInInitializerError: Unable to make field private final > java.util.Comparator java.util.TreeMap.comparator accessible: module > java.base does not "opens java.util" to unnamed module @7f51f588 > [ERROR] -> [Help 1]{quote} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (CAY-2253) Cayenne JDK9 compatibility
[ https://issues.apache.org/jira/browse/CAY-2253?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2253: - Environment: Java 9 (was: Java build 9-ea+158) > Cayenne JDK9 compatibility > -- > > Key: CAY-2253 > URL: https://issues.apache.org/jira/browse/CAY-2253 > Project: Cayenne > Issue Type: Task >Affects Versions: 4.0.M5 > Environment: Java 9 >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev > Fix For: 4.0.B3, 4.1.M1 > > > # All tests that validate di.spi.ModuleProvider presence fail as > ServiceLoader loads 2 providers instead of 1. > # *cayenne-server* > All tests related to hessian serialization are in error. > # *cayenne-client* > All tests related to hessian serialization are in error. > {quote}Unable to make private java.lang.StackTraceElement() accessible: > module java.base does not "opens java.lang" to unnamed module{quote} > # *cayenne-crypto* > javax.xml.bind.DatatypeConverter moved to a module that is not loaded by > default > see http://mail.openjdk.java.net/pipermail/jdk9-dev/2016-May/004309.html > {quote} > Caused by: java.lang.ClassNotFoundException: > javax.xml.bind.DatatypeConverter > at > java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:533) > at > java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:186) > at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:476) > ... 32 more > {quote} > # *cayenne-protostuff* > All tests related to protostuff serialization are in error. > {quote}Caused by: java.lang.reflect.InaccessibleObjectException: Unable to > make field private final java.lang.Object > java.util.Collections$SingletonSet.element accessible: module java.base does > not "opens java.util" to unnamed module{quote} > # *cayenne-doc* > Not really understood why this module is failing > # *tutorial-rop-server* > Seems that maven-war-plugin (3.0.0) is not compatible: > {quote} > [ERROR] Failed to execute goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war (default-war) on project > tutorial-rop-server: Execution default-war of goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war failed: Unable to load > the mojo 'war' in the plugin > 'org.apache.maven.plugins:maven-war-plugin:3.0.0' due to an API > incompatibility: > org.codehaus.plexus.component.repository.exception.ComponentLookupException: > null > ... > [ERROR] -: > ExceptionInInitializerError: Unable to make field private final > java.util.Comparator java.util.TreeMap.comparator accessible: module > java.base does not "opens java.util" to unnamed module @7f51f588 > [ERROR] -> [Help 1]{quote} -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Assigned] (CAY-2253) Cayenne JDK9 compatibility
[ https://issues.apache.org/jira/browse/CAY-2253?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev reassigned CAY-2253: Assignee: Nikita Timofeev > Cayenne JDK9 compatibility > -- > > Key: CAY-2253 > URL: https://issues.apache.org/jira/browse/CAY-2253 > Project: Cayenne > Issue Type: Task >Affects Versions: 4.0.M5 > Environment: Java build 9-ea+158 >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev > Fix For: 4.0.B3, 4.1.M1 > > > # All tests that validate di.spi.ModuleProvider presence fail as > ServiceLoader loads 2 providers instead of 1. > # *cayenne-server* > All tests related to hessian serialization are in error. > # *cayenne-client* > All tests related to hessian serialization are in error. > {quote}Unable to make private java.lang.StackTraceElement() accessible: > module java.base does not "opens java.lang" to unnamed module{quote} > # *cayenne-crypto* > javax.xml.bind.DatatypeConverter moved to a module that is not loaded by > default > see http://mail.openjdk.java.net/pipermail/jdk9-dev/2016-May/004309.html > {quote} > Caused by: java.lang.ClassNotFoundException: > javax.xml.bind.DatatypeConverter > at > java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:533) > at > java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:186) > at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:476) > ... 32 more > {quote} > # *cayenne-protostuff* > All tests related to protostuff serialization are in error. > {quote}Caused by: java.lang.reflect.InaccessibleObjectException: Unable to > make field private final java.lang.Object > java.util.Collections$SingletonSet.element accessible: module java.base does > not "opens java.util" to unnamed module{quote} > # *cayenne-doc* > Not really understood why this module is failing > # *tutorial-rop-server* > Seems that maven-war-plugin (3.0.0) is not compatible: > {quote} > [ERROR] Failed to execute goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war (default-war) on project > tutorial-rop-server: Execution default-war of goal > org.apache.maven.plugins:maven-war-plugin:3.0.0:war failed: Unable to load > the mojo 'war' in the plugin > 'org.apache.maven.plugins:maven-war-plugin:3.0.0' due to an API > incompatibility: > org.codehaus.plexus.component.repository.exception.ComponentLookupException: > null > ... > [ERROR] -: > ExceptionInInitializerError: Unable to make field private final > java.util.Comparator java.util.TreeMap.comparator accessible: module > java.base does not "opens java.util" to unnamed module @7f51f588 > [ERROR] -> [Help 1]{quote} -- This message was sent by Atlassian JIRA (v6.4.14#64029)