tree 11b98d98f0130d5ad5c9f48840cf3ac049fa7499
parent cf1d0ff26715d3a17eef62e44351997158d2d323
parent 71027f2d1326fc8bc3d4517b227dde3bbeb7946d
author Richard Eckart de Castilho <rec@apache.org> 1616092804 +0100
committer Richard Eckart de Castilho <rec@apache.org> 1616092804 +0100

Merge branch 'main' into feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0

* main:
  [UIMA-6341] Try out p2-layout-resolver
  [UIMA-6341] Try out p2-layout-resolver
  [UIMA-6341] Try out p2-layout-resolver
  [UIMA-6341] Try out p2-layout-resolver
  [UIMA-6325] Update to UIMA Parent POM 14
  no jira - update version to upcoming release
  UIMA-6340: Ruta: Condition AFTER does not respect BLOCK window
  UIMA-6338: Ruta: Inconsistency Interpreter vs. Guide on VOTE
  [UIMA-6341] Try out p2-layout-resolver
  [UIMA-6341] Try out p2-layout-resolver
  no jira -  adapt test
  UIMA-6332: Ruta: change seeders param default to TextSeeder
  UIMA-6338: Ruta: Inconsistency Interpreter vs. Guide on VOTE
  UIMA-6332: Ruta: change seeders param default to TextSeeder
  UIMA-6319: TextSeeder creates MARKUP annotations
  UIMA-6319: TextSeeder creates MARKUP annotations
  UIMA-6324: | and & REs may miss matches
  UIMA-6324: | and & REs may miss matches