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 f5a79a0a66e123401dd5960362e210879ac0234e
Merge: 100dd61 7d79a6d
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Fri Feb 7 16:06:28 2020 +0100
Merge pull request #81 from apache/sync-v2-to-master
Sync v2 to master
uimafit-core/pom.xml | 6 +
.../ConfigurationParameterInitializer.java | 74 ++--
.../uima/fit/factory/ExternalResourceFactory.java | 63 +++-
...{PropertyEditorUtil.java => ChatsetEditor.java} | 29 +-
.../propertyeditors/PropertyEditorUtil.java | 3 +
.../ConfigurationParameterInitializerTest.java | 385 ++++++++++++++++++++-
.../fit/factory/ResourceManagerFactoryTest.java | 55 +++
.../tools.uimafit.configurationparameters.xml | 21 +-
uimafit-parent/pom.xml | 2 +-
9 files changed, 572 insertions(+), 66 deletions(-)
