This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit b25e5acc2926933c9d07b6ef8fcadbcb5f9d0b92 Merge: 9b465cc c84f394 Author: Nikita Timofeev <[email protected]> AuthorDate: Thu Nov 19 16:06:19 2020 +0300 Merge remote-tracking branch 'parent/pr/439' into asf-master .../org/apache/cayenne/map/EntityResolver.java | 32 +++++- .../java/org/apache/cayenne/map/AnnotationIT.java | 82 ++++++++++++++++ .../testdo/annotation/ArtistAnnotation.java | 70 +++++++++++++ .../testdo/annotation/auto/_ArtistAnnotation.java | 108 +++++++++++++++++++++ .../cayenne/unit/di/server/CayenneProjects.java | 1 + .../cayenne/unit/di/server/SchemaBuilder.java | 3 +- .../test/resources/annotation/cayenne-project.xml | 7 ++ .../resources/annotation/datamapAnnotation.map.xml | 17 ++++ 8 files changed, 316 insertions(+), 4 deletions(-)
