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 2021/11/26 13:05:05 UTC
[uima-ruta] branch bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes updated (1bef66a -> abd45d3)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
from 1bef66a [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
add 3c8c8d3 no jira - prepare ruta v3 for testing uimaj-core rc
add 9d7c340 no jira - prepare ruta v3 for testing uimaj-core rc
add 7063210 no jira - remove test type system
add b70cb79 no jira - avoid compile errors with workarounds
add dbc9ccf no jira - uima v3 SNAPSHOT
add 8773566 no jira - update to released uimaj v3 beta
add 62a5374 no jira - update cover class
add 5bc2227 no jira - make it compatible to latest uimaFIT, updated uimaj-core version
add 7702db9 no jira - update readme/notes
add 35f4bd6 no jira - merge ruta v2 to ruta v3
add 9193a36 no jira - cleanup usage of commons-lang
add 640be17 UIMA-6024: apply cleanup of 2.7.0
add 05a03e5 UIMA-6024: apply changes of v2
add 3841fec UIMA-6024: clean up
add bc4c066 no jira- update urls, update versions
add 5d0b0f8 no jira- update urls
add 513abbe UIMA-5997: skip japicmp
add 0c6acc1 UIMA-6093: update parent version
add caa4e84 UIMA-6118: uima version
add aed53d7 UIMA-6024: manual merge with ruta 2.8.0 rc1
add 1bec99e UIMA-6024: fixed merge errors
add 0235ca2 UIMA-6024: clean up in failing test
add 8a1da3f UIMA-6024: fixed test
add 2a90a51 UIMA-6024: fixed generics
add 27b4d9f UIMA-6024: manual merge with v2
add 59aa3b3 UIMA-4676: fixed imports broken by manual merge
add 4c1175c no jira - fixed layout in docs
add b5009d9 UIMA-6150: fix right to left match in window by simplifying code, avoid using subiterators in uima v3
add 09b7f2f UIMA-6150: fixed tests, added missing emptyIsInvisible check
add c19a8f2 UIMA-6150: avoid using subiterators in filter
add bbaf75e UIMA-6154: fixed move on check
add faffea5 [maven-release-plugin] prepare release ruta-3.0.0
add 74a6825 [maven-release-plugin] prepare for next development iteration
add e485640 no jira - manual rollback
add 1183353 no jira - remove permgen mention
add c281e2f no jira - update some example v2 versions, fixed some typos
add 865129c no jira - fixed scm urls
add 2801832 [maven-release-plugin] prepare release ruta-3.0.0
add f31f835 [maven-release-plugin] prepare for next development iteration
add 3a208f6 no jira - manual rollback
add acecd9e [maven-release-plugin] prepare release ruta-3.0.0
add e1631ed [maven-release-plugin] prepare for next development iteration
add d7c7907 no jira - manual rollback
add 74257dc [maven-release-plugin] prepare release ruta-3.0.0
add ed79ca4 [maven-release-plugin] prepare for next development iteration
add 0d961d8 no jira - manual rollback
add 6d06e5a no jira - fix eclispe update site link to v3
add 32de728 no jira - avoid problems in jenkins job
add ca1ccb3 [maven-release-plugin] prepare release ruta-3.0.0
add 7ac7501 [maven-release-plugin] prepare for next development iteration
add 7417f02 no jira - manual rollback
add dd29013 no jira fix jira version, improve readme/release-notes
add 9dd61c8 no jira - improve release-notes
add 1d7e2b2 no jira - improve release-notes
add d69e99d [maven-release-plugin] prepare release ruta-3.0.0
add f24224c [maven-release-plugin] prepare for next development iteration
add f2262f6 no jira - fix readme/release-notes according rc review
add 01d2a40 UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens
add e2de91f no jira - preparations fro next release - updated versions - updated jira version - updated release notes
add 1d9cce9 no jira - update updatesite version
add 92b35ed merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171
add f5fb57b [maven-release-plugin] prepare release ruta-3.0.1
add fdc9355 [maven-release-plugin] prepare for next development iteration
add 7d8eeec no jira - manual rollback
add 0fe2c34 UIMA-6194: merge v2 changes
add ab7d1f0 [maven-release-plugin] prepare release ruta-3.0.1
add 2c049ed [maven-release-plugin] prepare for next development iteration
add ecde41d [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror.
add ed91636 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
add 723d532 [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
add 2f835d3 Merge branch 'master' into UIMA-6233-Failing-unit-tests-depending-on-test-execution-order
add 22085e1 Merge pull request #3 from apache/UIMA-6233-Failing-unit-tests-depending-on-test-execution-order
add a89df52 [UIMA-6236] Migrating Apache UIMA Ruta from SVN to git/GitHub
add 0b67cab Merge pull request #4 from apache/UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git
add b297bd0 Merge branch 'master' into NO-JIRA-extend-readme
add 992b67a Merge pull request #6 from apache/NO-JIRA-extend-readme
add 894ab69 Merge branch 'master' into NO-JIRA-exclude-metainf
add fbdaab6 Merge pull request #8 from apache/NO-JIRA-exclude-metainf
add 6e1c85f Merge branch 'master' into UIMA-6260-Jenkinsfile-for-Ruta
add adc8142 Merge branch 'master' into UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta
add 2cd0bc0 Merge pull request #10 from apache/UIMA-6231-Reducing-memory-pressure-generated-by-UIMA-Ruta
add aa172f1 Merge branch 'master' into UIMA-6260-Jenkinsfile-for-Ruta
add e40d0ff Merge pull request #12 from apache/UIMA-6260-Jenkinsfile-for-Ruta
add 2cca4b4 Merge branch 'UIMA-6258-Action-FILL-only-considers-first-annotation-of-given-type'
add c120761 Merge branch 'master' into UIMA-6261-verbalization-NullExpression
add 7fa68db Merge branch 'master' into UIMA-6256-SPLIT-creates-invalid-annotations
add 3933cc4 Merge branch 'master' into UIMA-6268-internal-indexing
add ce0646f Merge pull request #17 from apache/UIMA-6268-internal-indexing
add a2ceebd Merge branch 'master' into UIMA-6271-validate-internal-ruta-indexing
add d328681 Merge pull request #19 from apache/UIMA-6271-validate-internal-ruta-indexing
add 970575d UIMA-6271: Ruta: option to validate internal indexing in RutaEngine
add 356b511 no jira - deactivate test for now
add c0d655f UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally
add e1aacd2 UIMA-6281: Ruta: use uimaFIT instead of CAS.select().coveredBy() internally
add 4d2b15e UIMA-6281: fix method for null arguments
add 1b61423 Merge pull request #20 from apache/UIMA-6281-uimaFIT-coveredBy
add 1b06b27 HD-6268: revised and improved documentation
add 21d1eda Merge branch 'master' of https://github.com/apache/uima-ruta
add 90a3020 [UIMA-6307] Centralize Jenkins pipelines
add 630ec06 [UIMA-6301] Rename "master" branches to "main"
add 2e4cd1e Merge remote-tracking branch 'origin/main' into UIMA-6302-Ruta-error-visualizing-comparing-annotation-in-CAS-Editor-views
add 3b91054 Merge branch 'main'
add bd45170 Merge pull request #22 from apache/master
add 2e4905c Merge branch 'main' into bugfix/UIMA-6323-SeedLexer-not-generated-when-building-in-Eclipse
add e7115ee Merge pull request #24 from apache/bugfix/UIMA-6323-SeedLexer-not-generated-when-building-in-Eclipse
add 4bdadd0 Merge branch 'main' into feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
add 9c3fc3e Merge pull request #26 from apache/feature/UIMA-6325-Update-to-UIMA-Parent-POM-14
add e6d25f6 [UIMA-6341] Try out p2-layout-resolver
add b6808b2 [UIMA-6341] Try out p2-layout-resolver
add e9d1f13 [UIMA-6325] Update to UIMA Parent POM 14
add 7e54f0a Merge commit '41dd4b51bd7a7c206f7dd9294eb3bf1d6acc3913' into feature/UIMA-6341-Try-out-p2-layout-resolver
add 7abd860 [UIMA-6341] Try out p2-layout-resolver
add e248e27 [UIMA-6341] Try out p2-layout-resolver
add 71027f2 Merge pull request #36 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver
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 2eff6e4 [UIMA-6219] Logger errors when running Ruta script
add 73f3eea [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
add d538e7c [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
add 56b791c [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
add ad32207 [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
add e929139 [UIMA-6325] Update to UIMA Parent POM 14
add cf1d0ff [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
add accfec3 Merge branch 'main' into feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
add c1af638 Merge branch 'main' into feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
add 3fe408b Merge pull request #29 from apache/feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
add 3976a71 Merge branch 'main' into bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
add 5ea4fd7 Merge branch 'main' into bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
add 1266f14 Merge branch 'main' into bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
add 3f7da52 [UIMA-6219] Logger errors when running Ruta script
add acd978d Merge pull request #54 from apache/bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
add 8ed1cc7 [UIMA-6360] UIMA Ruta 3.1.0 release
add 8b59f62 [UIMA-6360] UIMA Ruta 3.1.0 release
add ba05f00 [UIMA-6360] UIMA Ruta 3.1.0 release
add 424c575 [maven-release-plugin] prepare release ruta-3.1.0
add 12cefeb Revert "[maven-release-plugin] prepare release ruta-3.1.0"
add 1963427 [UIMA-6360] UIMA Ruta 3.1.0 release
add 0d41bb8 [UIMA-6360] UIMA Ruta 3.1.0 release
add 40ae9fa [maven-release-plugin] prepare release ruta-3.1.0
add 9ee00d8 [maven-release-plugin] prepare for next development iteration
add 33705d0 [UIMA-6360] UIMA Ruta 3.1.0 release
add 0b0c9d6 Revert "[maven-release-plugin] prepare for next development iteration"
add 8336b36 Revert "[maven-release-plugin] prepare release ruta-3.1.0"
add 18b9c6b [UIMA-6360] UIMA Ruta 3.1.0 release
add 4b6a018 [maven-release-plugin] prepare release ruta-3.1.0
add b9a28a8 [maven-release-plugin] prepare for next development iteration
add 661478c no jira - manual rollback
add fd25838 [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles
add 97ff6f1 [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles
add ade1c50 [UIMA-6361] p2-layout-resolver upgrade required for Java 16 builds
add 74e2c54 [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles
add 3bdfda9 Merge pull request #57 from apache/UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
add b62ba33 [maven-release-plugin] prepare release ruta-3.1.0
add 0f0fb55 Revert "[maven-release-plugin] prepare release ruta-3.1.0"
add ade09ef [maven-release-plugin] prepare release ruta-3.1.0
add 65daca9 [maven-release-plugin] prepare for next development iteration
add dc19d00 Merge branch 'main' into bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https
add 6267614 Merge pull request #59 from apache/bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https
add abd45d3 Merge branch 'main' into bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
No new revisions were added by this update.
Summary of changes:
README | 5 +-
RELEASE_NOTES.html | 49 ++-
.../ruta-ep-example-extensions/.gitignore | 2 +-
.../ruta-ep-example-extensions/pom.xml | 8 +-
example-projects/ruta-maven-example/pom.xml | 12 +-
pom.xml | 48 +--
ruta-basic-type/pom.xml | 12 +-
.../java/org/apache/uima/ruta/type/RutaBasic.java | 85 +++--
.../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 ------
ruta-core-ext/pom.xml | 12 +-
ruta-core/pom.xml | 22 +-
.../java/org/apache/uima/ruta/FilterManager.java | 7 +-
.../java/org/apache/uima/ruta/RutaEnvironment.java | 1 -
.../main/java/org/apache/uima/ruta/RutaStream.java | 113 ++++---
.../apache/uima/ruta/condition/NearCondition.java | 2 +-
.../java/org/apache/uima/ruta/engine/Ruta.java | 13 +-
.../org/apache/uima/ruta/engine/RutaEngine.java | 11 +-
.../org/apache/uima/ruta/engine/RutaTestUtils.java | 7 +-
.../expression/feature/FeatureMatchExpression.java | 2 +-
.../feature/SimpleFeatureExpression.java | 4 +-
.../uima/ruta/resource/MultiTreeWordList.java | 10 +-
.../apache/uima/ruta/resource/TreeWordList.java | 3 +-
.../uima/ruta/rule/AnnotationListFSIterator.java | 94 ++++++
.../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 246 ++++++--------
.../apache/uima/ruta/rule/WildCardRuleElement.java | 33 +-
.../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 +
.../apache/uima/ruta/ReindexUpdateModeTest.java | 2 +
.../uima/ruta/engine/MultipleSeedersTest.java | 100 +++---
.../apache/uima/ruta/engine/RulesParamTest.java | 12 +-
.../java/org/apache/uima/ruta/engine/RutaTest.java | 7 +-
.../AnnotationAddressExpressionTest.java | 17 +-
.../AnnotationFeatureExpressionTest.java | 13 +-
.../annotation/AnnotationLabelExpressionTest.java | 8 +-
.../AnnotationVariableExpressionTest.java | 4 +-
.../expression/feature/FeatureStructureTest.java | 3 +-
.../apache/uima/ruta/resource/CSVTableTest.java | 150 ++++-----
.../org/apache/uima/ruta/rule/WildCard2Test.java | 17 +-
.../uima/ruta/rule/WildCardInWindowTest.java | 26 +-
.../DebugAddToIndexesTest.java} | 41 +--
.../ruta/visitor/InlinedRulesExplanationTest.java | 16 +-
ruta-docbook/pom.xml | 13 +-
ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +-
.../tools.ruta.language.internal_indexing.xml | 52 +--
ruta-docbook/src/docbook/tools.ruta.overview.xml | 14 +
ruta-eclipse-feature/pom.xml | 12 +-
ruta-eclipse-update-site/category.xml | 2 +-
ruta-eclipse-update-site/pom.xml | 86 ++---
ruta-ep-addons/pom.xml | 13 +-
.../uima/ruta/cde/ui/ConstraintSelectView.java | 3 +-
.../org/apache/uima/ruta/cde/ui/DocumentView.java | 3 +-
.../org/apache/uima/ruta/cde/ui/ResultView.java | 2 +-
.../uima/ruta/check/AnnotationCheckView.java | 2 +-
.../apache/uima/ruta/explain/apply/ApplyView.java | 2 +-
.../uima/ruta/explain/createdBy/CreatedByView.java | 4 +-
.../uima/ruta/explain/element/ElementView.java | 2 +-
.../uima/ruta/explain/failed/FailedView.java | 2 +-
.../uima/ruta/explain/inlined/InlinedView.java | 2 +-
.../uima/ruta/explain/matched/MatchedView.java | 2 +-
.../uima/ruta/explain/rulelist/RuleListView.java | 2 +-
.../explain/selection/ExplainSelectionView.java | 2 +-
.../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +-
.../ruta/explain/tree/RuleElementMatchNode.java | 7 +-
.../org/apache/uima/ruta/query/ui/QueryView.java | 6 +-
.../uima/ruta/statistics/StatisticsView.java | 5 +-
.../ruta/testing/ui/views/TestPageBookView.java | 5 +-
.../testing/ui/views/fn/FalseNegativeView.java | 3 +-
.../testing/ui/views/fp/FalsePositiveView.java | 3 +-
.../ruta/testing/ui/views/tp/TruePositiveView.java | 5 +-
ruta-ep-caseditor/.gitignore | 2 +-
ruta-ep-caseditor/pom.xml | 13 +-
.../view/browser/AnnotationBrowserView.java | 2 -
.../uima/ruta/caseditor/view/html/HtmlView.java | 47 +--
.../caseditor/view/selection/SelectionView.java | 3 +-
ruta-ep-core-ext/pom.xml | 13 +-
ruta-ep-engine/.gitignore | 2 +-
ruta-ep-engine/pom.xml | 52 +--
ruta-ep-engine/src/main/readme_bin/LICENSE | 359 +++++++++++++++++----
ruta-ep-engine/src/main/readme_bin/NOTICE | 135 ++++----
ruta-ep-ide-ui/.gitignore | 2 +-
ruta-ep-ide-ui/pom.xml | 13 +-
ruta-ep-ide/.gitignore | 2 +-
ruta-ep-ide/pom.xml | 15 +-
ruta-ep-parent/pom.xml | 92 +-----
ruta-ep-textruler/.gitignore | 2 +-
ruta-ep-textruler/pom.xml | 12 +-
ruta-maven-archetype/pom.xml | 12 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
ruta-maven-plugin/pom.xml | 16 +-
ruta-parent/pom.xml | 154 +++++++--
ruta-typesystem/pom.xml | 12 +-
.../uima/ruta/engine/RutaInternalTypeSystem.xml | 7 +-
94 files changed, 1433 insertions(+), 1211 deletions(-)
delete mode 100644 ruta-basic-type/src/main/java/org/apache/uima/ruta/type/RutaBasic_Type.java
copy ruta-core/src/test/java/org/apache/uima/ruta/{action/ConfigureTest.java => visitor/DebugAddToIndexesTest.java} (53%)