This is an automated email from the ASF dual-hosted git repository. pkluegl pushed a change to branch feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
from accfec3 Merge branch 'main' into feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0 add 3943512 Merge pull request #35 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver-v2 add ef22099 UIMA-6343: Ruta should provide config parameters to ease type disambiguation add fcd5344 UIMA-6343: Ruta should provide config parameters to ease type disambiguation add 910f065 Merge pull request #37 from apache/feature/UIMA-6343-Ruta-should-provide-config-parameters-to-ease-type-disambiguation add 2ff9175 [UIMA-6344] Ruta: ConjunctRules fires without justification add 8a78b08 Merge pull request #39 from apache/bugfix/UIMA-6344-Ruta-ConjunctRules-fires-without-justification add 16ebbea [UIMA-6255] Ruta: font and syntax coloring in dark mode in Ruta Workbench add b27b8f1 Merge pull request #40 from apache/feature/UIMA-6255-Ruta-font-and-syntax-coloring-in-dark-mode add bf7b081 [UIMA-6213] Ruta: LayerInstantiationException in LaunchDelegate using newer Java versions add e36684c Merge pull request #42 from apache/bugfix/UIMA-6213-Ruta-LayerInstantiationException add 94494d2 [UIMA-6247] Ruta: not able to check label expression on null as implicit condition add dc1a402 Merge pull request #44 from apache/bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition add 9b0bd51 [UIMA-6309] Ruta: fallback in failed wildcard lookahead add 0a303ee Merge pull request #46 from apache/bugfix/UIMA-6309-Ruta-fallback-in-failed-wildcard-lookahead add d49c0c4 [UIMA-6345] RutaBasicUtils should not require RutaBasic type add 9df9606 Merge pull request #49 from apache/bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type add 7064b4e [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax add d4e5fa5 [UIMA-6346] Ruta Action ADD case FLOAT missing add dee9abe [UIMA-6346] Ruta Action ADD case FLOAT missing add ee35c98 [UIMA-6346] Ruta Action ADD case FLOAT missing add 80a1fcb Merge branch 'main' into feature/UIMA-6343-Ruta-should-provide-config-parameters-to-ease-type-disambiguation add bef7112 Merge pull request #38 from apache/feature/UIMA-6343-Ruta-should-provide-config-parameters-to-ease-type-disambiguation add 9e67426 Merge branch 'main' into bugfix/UIMA-6344-Ruta-ConjunctRules-fires-without-justification add 9e2880a Merge pull request #41 from apache/bugfix/UIMA-6344-Ruta-ConjunctRules-fires-without-justification add 987d01d no jira - adapt version to next minor release add 0a0edc8 Merge branch 'main' into feature/UIMA-6255-Ruta-font-and-syntax-coloring-in-dark-mode add 2dc79f1 Merge pull request #43 from apache/feature/UIMA-6255-Ruta-font-and-syntax-coloring-in-dark-mode add c8bba8f Merge branch 'main' into bugfix/UIMA-6213-Ruta-LayerInstantiationException add 1e8b42a Merge pull request #45 from apache/bugfix/UIMA-6213-Ruta-LayerInstantiationException add 0287dee Merge branch 'main' into bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition add ad19310 Merge pull request #47 from apache/bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition add 15c9167 Merge branch 'main' into bugfix/UIMA-6309-Ruta-fallback-in-failed-wildcard-lookahead add 8784d50 Merge pull request #48 from apache/bugfix/UIMA-6309-Ruta-fallback-in-failed-wildcard-lookahead add 13ff863 Merge branch 'main' into bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type add d27aee0 Merge pull request #50 from apache/bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type add 6de2911 [UIMA-6356] Ruta: option to indentify groups of eval annotations add d73d9ee Merge pull request #51 from apache/UIMA-6356-Ruta-option-to-indentify-groups-of-eval-annotations add 8ff9af3 no jira - update uimaj version add ee6c431 [UIMA-6359] Ruta: parameter to add debug annotations to indexes add db0996d Merge pull request #52 from apache/feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes add 87b1a32 no jira - add param to descriptor add 2dc46ce [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax add 87da060 Merge branch 'main' into bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing add c1af638 Merge branch 'main' into feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0 No new revisions were added by this update. Summary of changes: .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml | 2 +- pom.xml | 2 +- ruta-basic-type/pom.xml | 2 +- ruta-core-ext/pom.xml | 2 +- .../org/apache/uima/ruta/block/fst/Automaton.java | 10 +-- ruta-core/pom.xml | 2 +- .../org/apache/uima/ruta/parser/RutaParser.g | 6 +- .../java/org/apache/uima/ruta/RutaBasicUtils.java | 10 +++ .../java/org/apache/uima/ruta/RutaEnvironment.java | 26 ++++++- .../org/apache/uima/ruta/action/AddAction.java | 4 +- .../org/apache/uima/ruta/action/RemoveAction.java | 6 +- .../java/org/apache/uima/ruta/engine/Ruta.java | 13 ++-- .../org/apache/uima/ruta/engine/RutaEngine.java | 23 +++++- .../expression/feature/FeatureMatchExpression.java | 2 +- .../feature/SimpleFeatureExpression.java | 4 +- .../uima/ruta/resource/MultiTreeWordList.java | 1 - .../apache/uima/ruta/resource/TreeWordList.java | 1 - .../apache/uima/ruta/rule/ComposedRuleElement.java | 4 + .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 14 ++-- .../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 ++ .../InListTest.java => TypeIgnorePatternTest.java} | 87 ++++++++++++---------- .../java/org/apache/uima/ruta/action/AddTest.java | 17 +++++ .../org/apache/uima/ruta/engine/DummySeeder.java | 73 +++++++++--------- .../apache/uima/ruta/engine/RulesParamTest.java | 12 +-- .../java/org/apache/uima/ruta/engine/RutaTest.java | 7 +- .../uima/ruta/engine/TestRutaInferenceVisitor.java | 1 + .../AnnotationAddressExpressionTest.java | 17 ++--- .../AnnotationFeatureExpressionTest.java | 13 ++-- .../annotation/AnnotationLabelExpressionTest.java | 58 ++++++++++++++- .../AnnotationVariableExpressionTest.java | 4 +- .../expression/feature/FeatureStructureTest.java | 3 +- .../apache/uima/ruta/rule/ConjunctRulesTest.java | 29 ++++++++ .../apache/uima/ruta/rule/RuleInference1Test.java | 20 +++-- .../org/apache/uima/ruta/rule/WildCard2Test.java | 12 +++ .../DebugAddToIndexesTest.java} | 41 +++++----- .../ruta/visitor/InlinedRulesExplanationTest.java | 16 ++-- ruta-docbook/pom.xml | 2 +- .../src/docbook/tools.ruta.language.conditions.xml | 2 +- ruta-docbook/src/docbook/tools.ruta.overview.xml | 30 ++++++++ ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/pom.xml | 2 +- ruta-ep-addons/pom.xml | 2 +- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/pom.xml | 2 +- .../launching/RutaLaunchConfigurationDelegate.java | 27 ++++--- .../uima/ruta/ide/ui/text/RutaCodeScanner.java | 18 +++-- .../uima/ruta/ide/ui/text/RutaColorConstants.java | 2 + ruta-ep-ide/pom.xml | 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 2 +- ruta-parent/pom.xml | 18 ++++- ruta-typesystem/pom.xml | 2 +- .../uima/ruta/engine/RutaInternalTypeSystem.xml | 7 +- 61 files changed, 500 insertions(+), 261 deletions(-) copy ruta-core/src/test/java/org/apache/uima/ruta/{condition/InListTest.java => TypeIgnorePatternTest.java} (60%) copy ruta-core/src/test/java/org/apache/uima/ruta/{action/ConfigureTest.java => visitor/DebugAddToIndexesTest.java} (53%)