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-uimafit.git

commit 97083f4041a90bc10539df3812c1dcfca1b3db23
Merge: bee0cbf 384af43
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Sun Apr 26 22:57:24 2020 +0200

    Merge pull request #105 from apache/sync-master-v2-to-master
    
    Sync master v2 to master

 uimafit-core/.settings/org.eclipse.jdt.core.prefs  |  1 +
 .../org/apache/uima/fit/factory/package-info.java  |  2 +-
 .../org/apache/uima/fit/util/package-info.java     |  6 +-
 .../uima/fit/component/CasMultiplierTest.java      | 14 ++---
 .../fit/component/ViewCreatorAnnotatorTest.java    | 62 +++++++++++++++----
 .../fit/component/ViewTextCopierAnnotatorTest.java | 26 +++++++-
 .../AnalysisEngineFactoryExternalResourceTest.java | 71 +++++++++++-----------
 .../fit/factory/AnalysisEngineFactoryTest.java     |  3 +-
 .../fit/factory/testRes/TestExternalResource.java  |  2 +-
 .../factory/testRes/TestSharedResourceObject.java  |  3 +-
 .../java/org/apache/uima/fit/util/CasUtilTest.java | 10 +--
 .../org/apache/uima/fit/util/JCasUtilTest.java     | 65 ++++++++++----------
 uimafit-cpe/.settings/org.eclipse.jdt.core.prefs   |  1 +
 .../org/apache/uima/fit/cpe/CasMultiplierTest.java | 15 ++---
 .../uima/fit/cpe/ExternalResourceFactoryTest.java  | 14 +++--
 .../.settings/org.eclipse.jdt.core.prefs           |  1 +
 .../.settings/org.eclipse.jdt.core.prefs           |  1 +
 uimafit-parent/pom.xml                             | 43 +++++++++++--
 .../.settings/org.eclipse.jdt.core.prefs           |  1 +
 19 files changed, 223 insertions(+), 118 deletions(-)

Reply via email to