This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit db60e5f31bb8b92bb9d0b36e52e928be8c3f5a11
Merge: e1aa503 caae4c5
Author: mischor <m...@schor.com>
AuthorDate: Fri Jan 17 11:35:47 2020 -0500
Merge pull request #30 from
apache/enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
Enhancement/uima 6128 xml 1 1 merge v2 into v3
.gitignore | 2 +
.../java/org/apache/uima/cas/SerialFormat.java | 11 +
.../org/apache/uima/cas/impl/XCASSerializer.java | 27 +-
.../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +-
.../main/java/org/apache/uima/util/CasIOUtils.java | 1090 ++++++++++----------
.../apache/uima/cas/impl/XmiCasSerializerTest.java | 8 +-
6 files changed, 651 insertions(+), 546 deletions(-)
