This is an automated email from the ASF dual-hosted git repository.
schor pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from e1aa503 Merge pull request #26 from apache/master-merge-v2
add 4d8f006 no Jira - fix up gitIgnore fore cpe test data
add ddd62f6 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries,
and support serializing using these.
add a62793d Merge pull request #28 from
apache/enhancement/UIMA-6128-xml-1-1
add caae4c5 Merge branch 'master-v2' of
https://github.com/apache/uima-uimaj into
enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
new db60e5f Merge pull request #30 from
apache/enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
