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 2020/04/19 14:36:03 UTC
[uima-uimafit] 01/01: Merge branch 'master-v2' into release/2.5.0
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch release/2.5.0
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 923b5cda6aa74f7d0d2497d00039656e7785c5ec
Merge: 4458a2b 6a6865a
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Sun Apr 19 16:35:51 2020 +0200
Merge branch 'master-v2' into release/2.5.0
* master-v2:
[UIMA-6224] uimaFIT does not build on Java 14
[NO JIRA] Reduce console output during build by commenting out println statements in test code and trying to suppress stack traces of expected exceptions
[UIMA-6223] Groovy plugin causes warning during build
[UIMA-6223] Groovy plugin causes warning during build
[NO JIRA] Update Eclipse metadata files
[UIMA-6222] XML-related unit test fails on Java 9+
% Conflicts:
% uimafit-parent/pom.xml
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 | 73 +++++++++++-----------
.../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 | 18 ++++--
.../.settings/org.eclipse.jdt.core.prefs | 1 +
.../fit/component/ViewCreatorAnnotatorTest.java | 5 ++
.../fit/factory/ExternalResourceFactoryTest.java | 2 +-
.../fit/factory/testRes/TestExternalResource.java | 2 +-
.../factory/testRes/TestSharedResourceObject.java | 2 +-
.../java/org/apache/uima/fit/util/CasUtilTest.java | 12 ++--
.../org/apache/uima/fit/util/JCasUtilTest.java | 46 +++++++-------
.../.settings/org.eclipse.jdt.core.prefs | 1 +
uimafit-parent/pom.xml | 3 +-
.../.settings/org.eclipse.jdt.core.prefs | 1 +
24 files changed, 227 insertions(+), 146 deletions(-)