This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit e1aa503cbe8dc918a476033705421c115b0ad4c5 Merge: e1fbd54 04bb4c8 Author: mischor <m...@schor.com> AuthorDate: Thu Jan 16 10:04:59 2020 -0500 Merge pull request #26 from apache/master-merge-v2 Master merge v2 - merges in UIMA-5936 Pear Parameter overrides from v2 -> master uima-docbook-references/src/docbook/ref.pear.xml | 25 +- .../src/docbook/ref.xml.component_descriptor.xml | 2 +- .../impl/PearAnalysisEngineWrapper.java | 13 + .../org/apache/uima/resource/PearSpecifier.java | 53 +++- .../uima/resource/impl/PearSpecifier_impl.java | 32 +-- .../src/main/resources/resourceSpecifierSchema.xsd | 7 + .../impl/PearAnalysisEngineWrapperTest.java | 313 +++++++++++---------- .../uima/resource/impl/PearSpecifier_implTest.java | 51 ++-- .../apache/uima/util/impl/XMLParser_implTest.java | 19 +- .../resources/XmlParserTest/TestPearSpecifier.xml | 58 ++-- 10 files changed, 347 insertions(+), 226 deletions(-)