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 2018/01/19 12:54:18 UTC
[2/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/255' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/255' into asf-master
# Conflicts:
# cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
# 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/174898d5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/174898d5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/174898d5
Branch: refs/heads/master
Commit: 174898d5af5acc9f1242bdb2c4b108094d7b1307
Parents: 84687a7 a37df6b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Jan 19 15:33:01 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Jan 19 15:33:01 2018 +0300
----------------------------------------------------------------------
cayenne-cgen/pom.xml | 2 +-
.../cayenne/gen/ClassGenerationAction.java | 6 +-
.../gen/ClassGeneratorResourceLoader.java | 27 +++----
.../apache/cayenne/gen/ClassGenerationCase.java | 3 -
.../main/java/org/apache/cayenne/util/Util.java | 39 +++++++++-
cayenne-velocity/pom.xml | 2 +-
.../velocity/SQLTemplateResourceManager.java | 25 ++++---
.../velocity/VelocitySQLTemplateProcessor.java | 10 +--
.../SQLTemplateResourceManagerTest.java | 77 --------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/tools/DbImporterMojoTest.java | 2 +-
.../modeler/editor/SelectPropertiesPanel.java | 10 ++-
.../util/DbAttributePathComboBoxEditor.java | 2 +-
.../util/PathChooserComboBoxCellEditor.java | 2 +-
pom.xml | 4 +-
15 files changed, 84 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/174898d5/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 4b6d894,84f0217..0c93335
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -15,8 -15,7 +15,9 @@@ Changes/New Features
CAY-2372 Extract new modules from cayenne-server
CAY-2377 Cleanup deprecated code.
+CAY-2391 cdbimport: add option to skip user-defined relationships
+CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer
+ CAY-2394 Upgrade to Apache Velocity 2.0
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/174898d5/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/174898d5/pom.xml
----------------------------------------------------------------------