This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 7753709bf811acbe9ae797747d3f22c3ed751eac
Merge: 332769e 86cb158
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Sun Apr 26 23:08:59 2020 +0200
Merge pull request #38 from apache/sync-master-v2-to-master
Sync master v2 to master
uimaj-core/pom.xml | 8 +-
.../impl/CapabilityLanguageFlowController.java | 35 +-
.../apache/uima/flow/impl/FixedFlowController.java | 119 ++-
.../main/java/org/apache/uima/util/CasIOUtils.java | 6 +-
.../uima/flow/CapabilityLanguageFlowController.xml | 56 +-
.../org/apache/uima/flow/FixedFlowController.xml | 10 +-
.../impl/CapabilityLanguageFlowControllerTest.java | 62 ++
.../uima/flow/impl/FixedFlowControllerTest.java | 56 +-
.../CapabilityLanguageFlowController.xml | 0
.../FixedFlowController.xml | 0
uimaj-parent/pom.xml | 1007 ++++++++++----------
11 files changed, 782 insertions(+), 577 deletions(-)
