This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 0b636ff9b21feeb2f381182aa683a895515309a7 Merge: f05cec70 073333d6 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Fri May 20 12:29:14 2022 +0200 Merge pull request #90 from apache/no-jira/merge-3.1.x-into-main No jira/merge 3.1.x into main 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(-)
