You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@uima.apache.org by re...@apache.org on 2018/07/08 07:37:42 UTC

[uima-uimafit] 01/01: Merge branch '3.0.x' into feature/5793-fsutil.getFeature-fails-when-called-with-object.class-on-multi-valued-features-v3

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch feature/5793-fsutil.getFeature-fails-when-called-with-object.class-on-multi-valued-features-v3
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git

commit 9488a76d5ac15f2b854c89c0374a962429706bd2
Merge: 7c58138 78f81ce
Author: Richard Eckart de Castilho <ri...@gmail.com>
AuthorDate: Sun Jul 8 09:37:39 2018 +0200

    Merge branch '3.0.x' into feature/5793-fsutil.getFeature-fails-when-called-with-object.class-on-multi-valued-features-v3

 .../ConfigurationParameterInitializer.java         |  16 +-
 .../uima/fit/factory/CollectionReaderFactory.java  |   7 +-
 .../org/apache/uima/fit/pipeline/JCasIterable.java |  11 +-
 .../org/apache/uima/fit/pipeline/JCasIterator.java |  37 ++-
 .../apache/uima/fit/pipeline/SimplePipeline.java   |  47 +++-
 .../apache/uima/fit/util/FSCollectionFactory.java  | 296 +++++++++++++--------
 .../main/java/org/apache/uima/fit/util/FSUtil.java |  53 ++--
 .../org/apache/uima/fit/util/LifeCycleUtil.java    |  13 +
 .../uima/fit/util/FSCollectionFactoryTest.java     |  74 ++++--
 .../uima/fit/util/FSCollectionFactoryTest.java     |  74 +++---
 10 files changed, 411 insertions(+), 217 deletions(-)