tree 8be1906f7bf592354e97718bd9c1b8ed63d9a8f5
parent e9d1f13e79645af387d7fee22abbc74718fd6655
parent 41dd4b51bd7a7c206f7dd9294eb3bf1d6acc3913
author Richard Eckart de Castilho <rec@apache.org> 1616079041 +0100
committer Richard Eckart de Castilho <rec@apache.org> 1616079041 +0100

Merge commit '41dd4b51bd7a7c206f7dd9294eb3bf1d6acc3913' into feature/UIMA-6341-Try-out-p2-layout-resolver

* commit '41dd4b51bd7a7c206f7dd9294eb3bf1d6acc3913':
  [UIMA-6341] Try out p2-layout-resolver
  [UIMA-6341] Try out p2-layout-resolver
  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
  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

# Conflicts:
#	example-projects/ruta-ep-example-extensions/pom.xml
#	example-projects/ruta-maven-example/pom.xml
#	pom.xml
#	ruta-basic-type/pom.xml
#	ruta-core-ext/pom.xml
#	ruta-core/pom.xml
#	ruta-core/src/test/java/org/apache/uima/ruta/engine/DummySeeder.java
#	ruta-docbook/pom.xml
#	ruta-eclipse-feature/pom.xml
#	ruta-eclipse-update-site/pom.xml
#	ruta-ep-addons/pom.xml
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ResultView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/AnnotationCheckView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/apply/ApplyView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/createdBy/CreatedByView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/element/ElementView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/failed/FailedView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/inlined/InlinedView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/matched/MatchedView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/rulelist/RuleListView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/explain/selection/ExplainSelectionView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/statistics/StatisticsView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fn/FalseNegativeView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/fp/FalsePositiveView.java
#	ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/tp/TruePositiveView.java
#	ruta-ep-caseditor/pom.xml
#	ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/browser/AnnotationBrowserView.java
#	ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/html/HtmlView.java
#	ruta-ep-caseditor/src/main/java/org/apache/uima/ruta/caseditor/view/selection/SelectionView.java
#	ruta-ep-core-ext/pom.xml
#	ruta-ep-engine/pom.xml
#	ruta-ep-ide-ui/pom.xml
#	ruta-ep-ide/pom.xml
#	ruta-ep-parent/pom.xml
#	ruta-ep-textruler/pom.xml
#	ruta-maven-archetype/pom.xml
#	ruta-maven-plugin/pom.xml
#	ruta-parent/pom.xml
#	ruta-typesystem/pom.xml
v