This is an automated email from the ASF dual-hosted git repository.
abulatski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 7257d0af94c69d669351805f52d287f20dae23dd
Merge: 4422aa5 734cae4
Author: Arseni Bulatski <ancars...@gmail.com>
AuthorDate: Thu Jun 27 14:09:12 2019 +0300
Merge PR #392
RELEASE-NOTES.txt | 1 +
.../org/apache/cayenne/crypto/CryptoModule.java | 2 +-
.../cayenne/crypto/CryptoServerModuleProvider.java | 11 +-
.../reader/CryptoRowReaderFactoryDecorator.java | 212 ++++++++++++++++-----
.../apache/cayenne/crypto/Runtime_AES128_IT.java | 208 +++++++++++++++++++-
.../java/org/apache/cayenne/crypto/db/Table7.java | 9 +
.../org/apache/cayenne/crypto/db/auto/_Table1.java | 25 +++
.../crypto/db/auto/{_Table1.java => _Table7.java} | 54 ++----
.../src/test/resources/cayenne-crypto.xml | 2 +
cayenne-crypto/src/test/resources/datamap.map.xml | 20 +-
.../cayenne/access/jdbc/ColumnDescriptor.java | 3 -
.../jdbc/reader/DefaultRowReaderFactory.java | 28 +--
12 files changed, 466 insertions(+), 109 deletions(-)
diff --cc RELEASE-NOTES.txt
index 39f91cd,337e6e0..8f0ecc7
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -60,7 -60,7 +60,8 @@@ CAY-2577 Between property with extende
CAY-2578 Wrong bindings in select of related entity by compound FK
CAY-2580 Cgen: Can't use custom templates for client mode
CAY-2582 Double insert of manyToMany relationship mapped to Set
+ CAY-2584 Crypto: can't use ColumnSelect with encrypted columns
+CAY-2588 IdRowReader: ArrayIndexOutOfBoundsException
----------------------------------
Release: 4.1.B1
