tree c02fd800205cacc56fe545a80faa9b62313aed20
parent ef979edd00adab2211f78da7dd5b157483a425f5
parent 7137a02220267722208c89047128d8dddddb3f52
author Richard Eckart de Castilho <rec@apache.org> 1586532306 +0200
committer Richard Eckart de Castilho <rec@apache.org> 1586532306 +0200

[UIMA-6214] Method signature class in ExternalResourceFactory

* Merge branch '3.0.x' of https://github.com/mjunsilo/uima-uimafit into UIMA-6214-Method-signature-clash-in-ExternalResourceFactory
* This merge brings in the unit test provided by Mario Juric with the original bug report

# Conflicts:
#	uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java