Merge branch 'master' into CAY-2146 # Conflicts: # docs/doc/src/main/resources/RELEASE-NOTES.txt
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7fbcc016 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7fbcc016 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7fbcc016 Branch: refs/heads/master Commit: 7fbcc016c6425d539dc33a25165992d9b1f31cb6 Parents: 2df9ae8 f527275 Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue Nov 22 14:14:48 2016 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue Nov 22 14:14:48 2016 +0300 ---------------------------------------------------------------------- .../apache/cayenne/reflect/BeanAccessor.java | 14 ++-- .../tools/DbImportConfigurationValidator.java | 87 ++++++++++++++++++++ .../apache/cayenne/tools/DbImporterTask.java | 47 ++++------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../apache/cayenne/tools/DbImporterMojo.java | 37 ++------- 5 files changed, 122 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7fbcc016/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index ade50fb,b6e2f8b..b07f826 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -68,7 -68,7 +68,8 @@@ CAY-2128 Modeler stored procedures are CAY-2131 Modeler NullPointerException in reverse engineering when importing different catalogs in one datamap CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml CAY-2143 NPE in BaseSchemaUpdateStrategy + CAY-2144 cdbimport always fails for databases which don't support catalogs +CAY-2146 Vertical inheritance: record still inserted into parent db table when child validation fails ---------------------------------- Release: 4.0.M3
