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:02 UTC
[uima-uimafit] branch release/2.5.0 updated (587ca76 -> 923b5cd)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch release/2.5.0
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
from 587ca76 [maven-release-plugin] prepare for next development iteration
add efdb010 [UIMA-6222] XML-related unit test fails on Java 9+
add 919568b [UIMA-6223] Groovy plugin causes warning during build
add 4458a2b [UIMA-6223] Groovy plugin causes warning during build
add 04e4767 [NO JIRA] Update Eclipse metadata files
add 0770272 [NO JIRA] Reduce console output during build by commenting out println statements in test code and trying to suppress stack traces of expected exceptions
add 6613cee [UIMA-6223] Groovy plugin causes warning during build
add 7ff0da7 [UIMA-6223] Groovy plugin causes warning during build
add 5e296a1 Merge pull request #101 from apache/bugfix/UIMA-6223-UIMA-Groovy-plugin-causes-warning-during-build
add b464133 [UIMA-6222] XML-related unit test fails on Java 9+
add aa4cdea Merge pull request #100 from apache/bugfix/UIMA-6222-XML-related-unit-test-fails-on-Java-9
add c1cae24 [UIMA-6224] uimaFIT does not build on Java 14
add 6a6865a Merge pull request #102 from apache/bugfix/UIMA-6224-uimaFIT-does-not-build-on-Java-14
new 923b5cd Merge branch 'master-v2' into release/2.5.0
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:
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/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 | 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 | 21 +++++--
.../.settings/org.eclipse.jdt.core.prefs | 1 +
25 files changed, 244 insertions(+), 150 deletions(-)
[uima-uimafit] 01/01: Merge branch 'master-v2' into release/2.5.0
Posted by re...@apache.org.
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(-)