This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a commit to branch NO-JIRA-exclude-metainf in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 894ab69bb1a6ab52735e1d38133fab61103198f5 Merge: c209eb2 992b67a Author: Peter Klügl <peter.klu...@averbis.com> AuthorDate: Mon May 18 16:37:53 2020 +0200 Merge branch 'master' into NO-JIRA-exclude-metainf # Conflicts: # example-projects/ruta-ep-example-extensions/.gitignore # ruta-ep-addons/META-INF/MANIFEST.MF # ruta-ep-caseditor/.gitignore # ruta-ep-caseditor/META-INF/MANIFEST.MF # ruta-ep-core-ext/META-INF/MANIFEST.MF # ruta-ep-engine/.gitignore # ruta-ep-ide-ui/.gitignore # ruta-ep-ide/.gitignore # ruta-ep-textruler/.gitignore 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(-)