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 2020/06/25 11:20:41 UTC

[uima-ruta] 01/01: Merge branch 'master' into UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta

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

rec pushed a commit to branch UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit adc8142c3fa2df83bdc1d4dd09ee1ba733b66c22
Merge: 870cc8d fbdaab6
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Jun 25 13:20:13 2020 +0200

    Merge branch 'master' into UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta
    
    * master: (69 commits)
      [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
      [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror.
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release ruta-3.0.1
      UIMA-6194: merge v2 changes
      no jira - manual rollback
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release ruta-3.0.1
      merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171
      no jira - update updatesite version
      no jira - preparations fro next release - updated versions - updated jira version - updated release notes
      UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens
      no jira - fix readme/release-notes according rc review
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release ruta-3.0.0
      no jira - improve release-notes
      no jira - improve release-notes
      no jira fix jira version, improve readme/release-notes
      no jira - manual rollback
      [maven-release-plugin] prepare for next development iteration
      ...

 README                                             |   5 +-
 RELEASE_NOTES.html                                 |  25 ++-
 .../ruta-ep-example-extensions/.gitignore          |   2 +-
 .../ruta-ep-example-extensions/pom.xml             |   2 +-
 example-projects/ruta-maven-example/pom.xml        |   2 +-
 pom.xml                                            |  10 +-
 ruta-basic-type/pom.xml                            |   2 +-
 .../java/org/apache/uima/ruta/type/RutaBasic.java  |  85 ++++++--
 .../org/apache/uima/ruta/type/RutaBasic_Type.java  | 107 ----------
 ruta-core-ext/pom.xml                              |   2 +-
 ruta-core/pom.xml                                  |   3 +-
 .../java/org/apache/uima/ruta/FilterManager.java   |   6 +-
 .../java/org/apache/uima/ruta/RutaEnvironment.java |   1 -
 .../main/java/org/apache/uima/ruta/RutaStream.java |  75 ++++---
 .../apache/uima/ruta/condition/NearCondition.java  |   2 +-
 .../uima/ruta/resource/MultiTreeWordList.java      |   2 +-
 .../apache/uima/ruta/resource/TreeWordList.java    |   2 +-
 .../uima/ruta/rule/AnnotationListFSIterator.java   |  94 +++++++++
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 232 ++++++++-------------
 .../apache/uima/ruta/rule/WildCardRuleElement.java |  29 ++-
 .../org/apache/uima/ruta/engine/DummySeeder.java   |  74 +++----
 .../uima/ruta/engine/MultipleSeedersTest.java      | 100 ++++-----
 .../annotation/AnnotationLabelExpressionTest.java  |  13 --
 .../apache/uima/ruta/resource/CSVTableTest.java    | 150 ++++++-------
 .../org/apache/uima/ruta/rule/WildCard2Test.java   |  14 ++
 ruta-docbook/pom.xml                               |   3 +-
 ruta-docbook/src/docbook/tools.ruta.howtos.xml     |   8 +-
 ruta-eclipse-feature/pom.xml                       |   2 +-
 ruta-eclipse-update-site/category.xml              |   2 +-
 ruta-eclipse-update-site/pom.xml                   |  12 +-
 ruta-ep-addons/pom.xml                             |   2 +-
 .../apache/uima/ruta/explain/tree/ExplainTree.java |   6 +-
 .../ruta/explain/tree/RuleElementMatchNode.java    |   7 +-
 ruta-ep-caseditor/.gitignore                       |   2 +-
 ruta-ep-caseditor/pom.xml                          |   2 +-
 ruta-ep-core-ext/pom.xml                           |   2 +-
 ruta-ep-engine/.gitignore                          |   2 +-
 ruta-ep-engine/pom.xml                             |   2 +-
 ruta-ep-ide-ui/.gitignore                          |   2 +-
 ruta-ep-ide-ui/pom.xml                             |   2 +-
 ruta-ep-ide/.gitignore                             |   2 +-
 ruta-ep-ide/pom.xml                                |   2 +-
 ruta-ep-parent/pom.xml                             |   2 +-
 ruta-ep-textruler/.gitignore                       |   2 +-
 ruta-ep-textruler/pom.xml                          |   2 +-
 ruta-maven-archetype/pom.xml                       |   2 +-
 .../src/main/resources/archetype-resources/pom.xml |   2 +-
 ruta-maven-plugin/pom.xml                          |   6 +-
 ruta-parent/pom.xml                                |   6 +-
 ruta-typesystem/pom.xml                            |   2 +-
 50 files changed, 565 insertions(+), 558 deletions(-)