Merge remote-tracking branch 'remotes/parent/pr/265' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/750d3d55 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/750d3d55 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/750d3d55 Branch: refs/heads/master Commit: 750d3d551913f5c8cb325f6075853627668e5f55 Parents: efee1d3 6378c41 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Feb 5 12:28:29 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Feb 5 12:28:29 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + itests/cayenne-tools-itest/pom.xml | 178 ----- .../tools/CayenneGeneratorIntegrationTest.java | 186 ----- .../src/test/resources/cayenne-client.xml | 5 - .../src/test/resources/embeddable.map.xml | 27 - .../apache/cayenne/tools/cgen-dependent.map.xml | 19 - .../org/apache/cayenne/tools/cgen.map.xml | 15 - .../org/apache/cayenne/tools/velotemplate.vm | 13 - .../src/test/resources/testmap-client.map.xml | 730 ------------------ .../src/test/resources/testmap.map.xml | 735 ------------------- itests/pom.xml | 57 -- maven-plugins/cayenne-tools-itest/pom.xml | 178 +++++ .../tools/CayenneGeneratorIntegrationTest.java | 186 +++++ .../src/test/resources/cayenne-client.xml | 5 + .../src/test/resources/embeddable.map.xml | 27 + .../apache/cayenne/tools/cgen-dependent.map.xml | 19 + .../org/apache/cayenne/tools/cgen.map.xml | 15 + .../org/apache/cayenne/tools/velotemplate.vm | 13 + .../src/test/resources/testmap-client.map.xml | 730 ++++++++++++++++++ .../src/test/resources/testmap.map.xml | 735 +++++++++++++++++++ maven-plugins/pom.xml | 8 + pom.xml | 1 - 22 files changed, 1917 insertions(+), 1966 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/750d3d55/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc RELEASE-NOTES.txt index dbf604a,6ec11fb..37878eb --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -21,7 -21,7 +21,8 @@@ CAY-2393 Add sqlserver-docker profile t CAY-2394 Upgrade to Apache Velocity 2.0 CAY-2395 cdbimport: add option to create project file CAY-2396 Upgrade maven-assembly-plugin to 3.1.0 +CAY-2403 Extract eventbridges to top level + CAY-2404 Move itests to maven-plugins Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/750d3d55/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 1c088e3,f405f96..e3a1199 --- a/pom.xml +++ b/pom.xml @@@ -70,10 -74,7 +70,9 @@@ <module>cayenne-web</module> <module>cayenne-osgi</module> <module>cayenne-rop-server</module> - <module>eventbridges</module> + <module>cayenne-jgroups</module> + <module>cayenne-jms</module> + <module>cayenne-xmpp</module> - <module>itests</module> <module>maven-plugins</module> <module>modeler</module> <module>tutorials</module>