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/02/07 15:06:39 UTC

[uima-uimafit] branch master updated (100dd61 -> f5a79a0)

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

rec pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.


    from 100dd61  Merge pull request #77 from apache/sync-v2-into-master
     add 80412a6  [UIMA-6169] Support Charset-typed parameters in components
     add ab8f787  Merge pull request #78 from apache/feature/UIMA-6169-Support-Charset-typed-parameters-in-components
     add d4de3a0  [UIMA-6186] Factory methods for resource instances
     add a2dec8a  Merge pull request #79 from apache/feature/UIMA-6186-Factory-methods-for-resource-instances
     add 1b317de  Merge branch 'master-v2' into sync-v2-to-master
     add 6e65312  [UIMA-6186] Factory methods for resource instances
     add 9a99198  [UIMA-6186] Factory methods for resource instances
     add 36de13c  Merge pull request #80 from apache/origin/feature/UIMA-6186-Factory-methods-for-resource-instances
     add f071cc4  Merge branch 'master-v2' into sync-v2-to-master
     add 7d79a6d  [NO JIRA] Update AssertJ and fix build.
     new f5a79a0  Merge pull request #81 from apache/sync-v2-to-master

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/pom.xml                               |   6 +
 .../ConfigurationParameterInitializer.java         |  74 ++--
 .../uima/fit/factory/ExternalResourceFactory.java  |  63 +++-
 .../{LocaleEditor.java => ChatsetEditor.java}      |  18 +-
 .../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, 564 insertions(+), 63 deletions(-)
 copy uimafit-core/src/main/java/org/apache/uima/fit/internal/propertyeditors/{LocaleEditor.java => ChatsetEditor.java} (67%)
 create mode 100644 uimafit-core/src/test/java/org/apache/uima/fit/factory/ResourceManagerFactoryTest.java


[uima-uimafit] 01/01: Merge pull request #81 from apache/sync-v2-to-master

Posted by re...@apache.org.
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 <re...@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(-)