| commit | 1b317de0ceab64b467318452ab2fc06afea9e9a6 | [log] [tgz] |
|---|---|---|
| author | Richard Eckart de Castilho <rec@apache.org> | Mon Feb 03 08:39:08 2020 +0100 |
| committer | Richard Eckart de Castilho <rec@apache.org> | Mon Feb 03 08:39:08 2020 +0100 |
| tree | 339dfea8b0bb0f0489ee108af74e49c7744af836 | |
| parent | 100dd6178a7a24812f712bd00f41ca3600611b63 [diff] | |
| parent | a2dec8ab80502604f9d519da5af800d3fe4f186f [diff] |
Merge branch 'master-v2' into sync-v2-to-master * master-v2: [UIMA-6186] Factory methods for resource instances [UIMA-6169] Support Charset-typed parameters in components # Conflicts: # uimafit-core/pom.xml # uimafit-core/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java