You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/12/13 12:09:35 UTC

[uima-ruta] 01/01: Merge branch 'main' into bugfix/UIMA-6399-RutaPatternCache-prevents-CPEEngine-from-terminating

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch bugfix/UIMA-6399-RutaPatternCache-prevents-CPEEngine-from-terminating
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 4feb4891c9ed76f4b823a87d6ee891bec5cd1a7f
Merge: 5f2f51e 63822f1
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Dec 13 13:09:11 2021 +0100

    Merge branch 'main' into bugfix/UIMA-6399-RutaPatternCache-prevents-CPEEngine-from-terminating
    
    * main: (120 commits)
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release ruta-3.1.0
      Revert "[maven-release-plugin] prepare release ruta-3.1.0"
      [maven-release-plugin] prepare release ruta-3.1.0
      [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles
      [UIMA-6361] p2-layout-resolver upgrade required for Java 16 builds
      [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles
      [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles
      no jira - manual rollback
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release ruta-3.1.0
      [UIMA-6360] UIMA Ruta 3.1.0 release
      Revert "[maven-release-plugin] prepare release ruta-3.1.0"
      Revert "[maven-release-plugin] prepare for next development iteration"
      [UIMA-6360] UIMA Ruta 3.1.0 release
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release ruta-3.1.0
      [UIMA-6360] UIMA Ruta 3.1.0 release
      [UIMA-6360] UIMA Ruta 3.1.0 release
      Revert "[maven-release-plugin] prepare release ruta-3.1.0"
      ...

 README                                             |   5 +-
 RELEASE_NOTES.html                                 |  49 ++-
 .../ruta-ep-example-extensions/.gitignore          |   2 +-
 .../ruta-ep-example-extensions/pom.xml             |   8 +-
 example-projects/ruta-maven-example/pom.xml        |  12 +-
 pom.xml                                            |  48 +--
 ruta-basic-type/pom.xml                            |  12 +-
 .../java/org/apache/uima/ruta/type/RutaBasic.java  |  85 +++--
 .../org/apache/uima/ruta/type/RutaBasic_Type.java  | 107 ------
 ruta-core-ext/pom.xml                              |  12 +-
 ruta-core/pom.xml                                  |  22 +-
 .../java/org/apache/uima/ruta/FilterManager.java   |   7 +-
 .../java/org/apache/uima/ruta/RutaEnvironment.java |   1 -
 .../main/java/org/apache/uima/ruta/RutaStream.java | 113 ++++---
 .../apache/uima/ruta/condition/NearCondition.java  |   2 +-
 .../java/org/apache/uima/ruta/engine/Ruta.java     |  13 +-
 .../org/apache/uima/ruta/engine/RutaEngine.java    |  11 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java |   7 +-
 .../expression/feature/FeatureMatchExpression.java |   2 +-
 .../feature/SimpleFeatureExpression.java           |   4 +-
 .../uima/ruta/resource/MultiTreeWordList.java      |  10 +-
 .../apache/uima/ruta/resource/TreeWordList.java    |   3 +-
 .../uima/ruta/rule/AnnotationListFSIterator.java   |  94 ++++++
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 246 ++++++--------
 .../apache/uima/ruta/rule/WildCardRuleElement.java |  33 +-
 .../java/org/apache/uima/ruta/utils/UIMAUtils.java |   8 +-
 .../ruta/visitor/DebugInfoCollectorVisitor.java    |  17 +-
 .../apache/uima/ruta/visitor/DebugInfoFactory.java |  52 +--
 .../org/apache/uima/ruta/engine/BasicEngine.xml    |   6 +
 .../apache/uima/ruta/ReindexUpdateModeTest.java    |   2 +
 .../uima/ruta/engine/MultipleSeedersTest.java      | 100 +++---
 .../apache/uima/ruta/engine/RulesParamTest.java    |  12 +-
 .../java/org/apache/uima/ruta/engine/RutaTest.java |   7 +-
 .../AnnotationAddressExpressionTest.java           |  17 +-
 .../AnnotationFeatureExpressionTest.java           |  13 +-
 .../annotation/AnnotationLabelExpressionTest.java  |   8 +-
 .../AnnotationVariableExpressionTest.java          |   4 +-
 .../expression/feature/FeatureStructureTest.java   |   3 +-
 .../apache/uima/ruta/resource/CSVTableTest.java    | 150 ++++-----
 .../org/apache/uima/ruta/rule/WildCard2Test.java   |  17 +-
 .../uima/ruta/rule/WildCardInWindowTest.java       |  26 +-
 .../uima/ruta/visitor/DebugAddToIndexesTest.java   |  63 ++++
 .../ruta/visitor/InlinedRulesExplanationTest.java  |  16 +-
 ruta-docbook/pom.xml                               |  13 +-
 ruta-docbook/src/docbook/tools.ruta.howtos.xml     |   8 +-
 .../tools.ruta.language.internal_indexing.xml      |  52 +--
 ruta-docbook/src/docbook/tools.ruta.overview.xml   |  14 +
 ruta-eclipse-feature/pom.xml                       |  12 +-
 ruta-eclipse-update-site/category.xml              |   2 +-
 ruta-eclipse-update-site/pom.xml                   |  86 ++---
 ruta-ep-addons/pom.xml                             |  13 +-
 .../uima/ruta/cde/ui/ConstraintSelectView.java     |   3 +-
 .../org/apache/uima/ruta/cde/ui/DocumentView.java  |   3 +-
 .../org/apache/uima/ruta/cde/ui/ResultView.java    |   2 +-
 .../uima/ruta/check/AnnotationCheckView.java       |   2 +-
 .../apache/uima/ruta/explain/apply/ApplyView.java  |   2 +-
 .../uima/ruta/explain/createdBy/CreatedByView.java |   4 +-
 .../uima/ruta/explain/element/ElementView.java     |   2 +-
 .../uima/ruta/explain/failed/FailedView.java       |   2 +-
 .../uima/ruta/explain/inlined/InlinedView.java     |   2 +-
 .../uima/ruta/explain/matched/MatchedView.java     |   2 +-
 .../uima/ruta/explain/rulelist/RuleListView.java   |   2 +-
 .../explain/selection/ExplainSelectionView.java    |   2 +-
 .../apache/uima/ruta/explain/tree/ExplainTree.java |   6 +-
 .../ruta/explain/tree/RuleElementMatchNode.java    |   7 +-
 .../org/apache/uima/ruta/query/ui/QueryView.java   |   6 +-
 .../uima/ruta/statistics/StatisticsView.java       |   5 +-
 .../ruta/testing/ui/views/TestPageBookView.java    |   5 +-
 .../testing/ui/views/fn/FalseNegativeView.java     |   3 +-
 .../testing/ui/views/fp/FalsePositiveView.java     |   3 +-
 .../ruta/testing/ui/views/tp/TruePositiveView.java |   5 +-
 ruta-ep-caseditor/.gitignore                       |   2 +-
 ruta-ep-caseditor/pom.xml                          |  13 +-
 .../view/browser/AnnotationBrowserView.java        |   2 -
 .../uima/ruta/caseditor/view/html/HtmlView.java    |  47 +--
 .../caseditor/view/selection/SelectionView.java    |   3 +-
 ruta-ep-core-ext/pom.xml                           |  13 +-
 ruta-ep-engine/.gitignore                          |   2 +-
 ruta-ep-engine/pom.xml                             |  52 +--
 ruta-ep-engine/src/main/readme_bin/LICENSE         | 359 +++++++++++++++++----
 ruta-ep-engine/src/main/readme_bin/NOTICE          | 135 ++++----
 ruta-ep-ide-ui/.gitignore                          |   2 +-
 ruta-ep-ide-ui/pom.xml                             |  13 +-
 ruta-ep-ide/.gitignore                             |   2 +-
 ruta-ep-ide/pom.xml                                |  15 +-
 ruta-ep-parent/pom.xml                             |  92 +-----
 ruta-ep-textruler/.gitignore                       |   2 +-
 ruta-ep-textruler/pom.xml                          |  12 +-
 ruta-maven-archetype/pom.xml                       |  12 +-
 .../src/main/resources/archetype-resources/pom.xml |   2 +-
 ruta-maven-plugin/pom.xml                          |  16 +-
 ruta-parent/pom.xml                                | 154 +++++++--
 ruta-typesystem/pom.xml                            |  12 +-
 .../uima/ruta/engine/RutaInternalTypeSystem.xml    |   7 +-
 94 files changed, 1473 insertions(+), 1193 deletions(-)