tree 35d28866b0b5d660936d4a393cac0707ba301337
parent d69021992757759f17bdf535117a4fc8a36d4e82
parent 5b042deb37cb94f41ac34a8c4d4fadfd8a36706d
author Richard Eckart de Castilho <rec@apache.org> 1613555496 +0100
committer Richard Eckart de Castilho <rec@apache.org> 1613555496 +0100

Merge branch 'main' into feature/UIMA-6311-Add-generated-resources-output-folder-as-resource-folder

* main:
  [UIMA-6312] Better PEAR parameter support
  [UIMA-6314] Align preceding/following with predicate in UIMA core
  [UIMA-6314] Align preceding/following with predicate in UIMA core
  [UIMA-6312] Better PEAR parameter support