This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch no-jira/merge-3.1.x-into-main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
from f05cec70 Merge pull request #88 from apache/refactoring/UIMA-6438-Add-asf.yaml-files-to-UIMA-repos add 11e09e05 UIMA-6404: Ruta: @ with quantifier ignores matches add 351ddcaf UIMA-6405: Local variable not captured properly in a wildcard matching condition add e710b31e UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside the block add e7815243 UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside the block add 4d6c5bc0 Merge pull request #68 from apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block add 722ac79f Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add 422e1939 UIMA-6405: Local variable not captured properly in a wildcard matching condition add ae27103c Merge pull request #67 from apache/bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition add a0e50684 Merge branch 'maintenance/3.1.x' into bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches add a34dd3e6 UIMA-6404: Ruta: @ with quantifier ignores matches add 78b6ed43 Merge pull request #66 from apache/bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches add ec58d0a4 UIMA-6394: Ruta: label assignment in alternative match causes problems add 380d3c95 UIMA-6394: Ruta: label assignment in alternative match causes problems add 9cc74bde Merge pull request #69 from apache/bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems-bugfix add 11af409f no issue: fix method sig add 30ef5979 UIMA-6408: Ruta: No type check of features in TRANSFER add 8abfb30d UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 33579a79 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 3e75c1a9 UIMA-6383: Ruta: TRIE - Wordlist entry not annotated add 30c1013c Merge pull request #71 from apache/UIMA-6383-Ruta-TRIE-Wordlist-entry-not-annotated add ff2dd81f Merge branch 'maintenance/3.1.x' into UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER add 7b5844e0 Merge pull request #70 from apache/UIMA-6408-Ruta-No-type-check-of-features-in-TRANSFER add ade59396 UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens add 5c35e168 Merge pull request #72 from apache/bugfix/UIMA-6409-Ruta-possible-endless-wildcard-lookahead-in-combination-with-subtokens add d9b33219 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations add 19a61708 UIMA-6411: Ruta: avoid creation of RutaBasics for bad annotations add 9c0bb3ab Merge pull request #73 from apache/bugfix/UIMA-6411-Ruta-avoid-creation-of-RutaBasics-for-bad-annotations add 7d6808d7 UIMA-6414: Ruta: missing match for optional after sidestep out of composed add be1c456b UIMA-6414: Ruta: missing match for optional after sidestep out of composed add ffad5fb3 UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 30623e4e UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 84923f4b UIMA-6414: Ruta: missing match for optional after sidestep out of composed add 72c6b017 Merge pull request #74 from apache/bugfix/UIMA-6414-Ruta-missing-match-for-optional-after-sidestep-out-of-composed new 073333d6 Merge branch 'main' into no-jira/merge-3.1.x-into-main The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ruta-core/.gitignore | 2 + .../main/java/org/apache/uima/ruta/RutaStream.java | 11 +- .../apache/uima/ruta/action/TransferAction.java | 15 ++- .../org/apache/uima/ruta/engine/RutaTestUtils.java | 112 ++++++++++++++------- .../uima/ruta/resource/MultiTreeWordList.java | 39 ++++++- .../apache/uima/ruta/rule/AbstractRuleElement.java | 25 +++-- .../apache/uima/ruta/rule/ComposedRuleElement.java | 3 +- .../java/org/apache/uima/ruta/rule/RutaRule.java | 35 +++++-- .../org/apache/uima/ruta/rule/RutaRuleElement.java | 32 +++++- .../apache/uima/ruta/rule/WildCardRuleElement.java | 4 +- .../uima/ruta/ConjunctiveRuleElementTest.java | 12 +-- .../org/apache/uima/ruta/EmptyDocumentTest.java | 17 ++++ .../org/apache/uima/ruta/action/TransferTest.java | 44 +++++++- .../org/apache/uima/ruta/action/UnmarkTest.java | 54 +++++++--- .../annotation/AnnotationLabelExpressionTest.java | 32 ++++++ .../apache/uima/ruta/rule/ManualAnchoringTest.java | 27 ++++- .../uima/ruta/rule/SidestepInComposedTest.java | 14 +++ .../org/apache/uima/ruta/rule/WildCard2Test.java | 38 ++++++- .../ruta/rule/quantifier/MinMaxQuantifierTest.java | 22 +++- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 10 +- .../tools.ruta.workbench.create_dictionaries.xml | 3 + .../ruta/utils/twl/MultiTWLConverterHandler.java | 17 +++- .../uima/ruta/utils/twl/TWLConverterHandler.java | 17 +++- .../ui/preferences/RutaBuilderPreferencePage.java | 13 ++- .../ui/preferences/RutaPreferencesMessages.java | 12 +-- .../preferences/RutaPreferencesMessages.properties | 1 + .../uima/ruta/ide/core/RutaCorePreferences.java | 2 + .../ruta/ide/core/RutaPreferenceInitializer.java | 2 + ruta-maven-plugin/src/it/wordlists/pom.xml | 2 + .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 8 +- .../uima/ruta/maven/RutaGenerateTWLMojo.java | 8 +- 31 files changed, 517 insertions(+), 116 deletions(-) create mode 100644 ruta-core/.gitignore