tree 4c90d141570b459a33341d12c1bcf0dafb4c05a5
parent e574f9386464f838b05baa740ca4bf9c4cb60fa1
parent 90b5685b6df697f9ff940ebb94d8548b9f181208
author Richard Eckart de Castilho <rec@apache.org> 1602797384 +0200
committer Richard Eckart de Castilho <rec@apache.org> 1602797384 +0200

Merge branch 'master-v2' into bugfix/UIMA-6275-InitializableFactory-is-not-smart-enough-to-find-a-suitable-classloader

* master-v2:
  [UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
  [UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader

# Conflicts:
#	uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
#	uimafit-core/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
#	uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java