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 2020/10/18 20:58:43 UTC
[uima-uimafit] branch feature/UIMA-6227-Upgrade-to-xmlunit-2
updated (121adc4 -> c0efa96)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch feature/UIMA-6227-Upgrade-to-xmlunit-2
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
from 121adc4 [UIMA-6227] Upgrade to xmlunit 2
add a43d19b Merge pull request #68 from apache/master-v2
add 82affd1 [UIMA-5322] Create copy of uimaFIT source tree to be based on UIMA v3
add 75c68e7 [UIMA-5322] Create copy of uimaFIT source tree to be based on UIMA v3 - Set version to 3.0.0-SNAPSHOT
add 41cd582 [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3 - Comment out Log4J logging test as that no longer works against the log4j2 - Update reference data to accommodate the new ID that is printed after the type name when rendering an FS to string - Adjust classname tests that checked for old v2 classes
add ed87cd0 no jira, change compiler target and compliance to java 8 from 7.
add 3dcc205 [UIMA-5348] change ExtendedLogger to work with uv3 alpha02. add slf4j adapter for jul logger to tests. Change enforcer to NON_BACKWARD_COMPATIBLE because ExtendedLogger now has many new methods. (this should be backward compatible, though, in that old code should continue to work, but will need recompiling, I think, because superclass of ExtendedLogger changed.)
add a2ad2e6 [UIMA-5377,UIMA-5067] Merged changes from trunk
add 943ed3b [UIMA-5377] improve version compatibility checking for uimafit - Remove semver plugin references
add 7a43d91 [UIMA-5092] Merged changes from v2 trunk
add 5be9693 [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
add bf2d4ed [UIMA-5553] uv3: Ability to set just a parent classloader, but not classpath
add c4339a9 [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
add d3c9b59 [UIMA-5555] - ExternalResourceFactoryTest hangs at some tests due to remote URL accesses
add e331743 [UIMA-5568] - uv3: Drop ExtendedLogger from uimaFIT
add 5ff1f6f [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
add c2788d8 [UIMA-5580] Avoid warning about empty classpath when creating resource manager
add c0c06ff No issue. Moving uimaFIT-v3 next to the other v3 branches.
add b613940 [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
add 87ce470 [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
add 7e3753b No Jira. Copying the UIMAv3 version of uimaFIT to the regular SVN location in so it may sync to GitHub.
add 96a8bf9 [NO JIRA] Added .gitignore file
add a0763c6 [UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
add 47ea8fe Merge pull request #2 from apache/feature/5323-uimav3
add 71ebfc4 [UIMA-3928] createExternalResourceDescription() signatures shadowing each other
add 62ce4a8 [UIMA-3928] createExternalResourceDescription() signatures shadowing each other
add a303eee Merge pull request #3 from apache/feature/3928-create-external-resource-description-shadowing
add abf5f7e [UIMA-5792] - Drop legacy module from uimaFIT v3
add 5394f78 Merge pull request #6 from apache/feature/5792-drop-legacy-module-from-uimafit-v3
add f611f72 [UIMA-5805] No longer set extension classloader in DefaultResourceManagerCreator
add a6b6cf4 Merge pull request #9 from apache/feature/5805-do-not-set-extension-classloader-if-not-required-v3
add 0c22e8b [UIMA-5793] FSUtil.getFeature fails when called with Object.class on multi-valued features
add 7c58138 [UIMA-5793] FSUtil.getFeature fails when called with Object.class on multi-valued features
add 1aaca34 [UIMA-5808] Destroy auto-created resource managers if feasible
add f5f73c5 [UIMA-3325] FSCollectionFactory.createStringArray returns StringArrayFS
add 6d96f0c Merge branch '3.0.x' into feature/3325-fscollectionfactory-createstringarray-returns-stringarrayfs
add 4c81ba1 Merge pull request #5 from apache/feature/3325-fscollectionfactory-createstringarray-returns-stringarrayfs
add cc8a58e Merge branch '3.0.x' into feature/5808-destroy-auto-created-resource-managers-if-feasible-v3
add 78f81ce Merge pull request #11 from apache/feature/5808-destroy-auto-created-resource-managers-if-feasible-v3
add 9488a76 Merge branch '3.0.x' into feature/5793-fsutil.getFeature-fails-when-called-with-object.class-on-multi-valued-features-v3
add 03d169d Merge pull request #13 from apache/feature/5793-fsutil.getFeature-fails-when-called-with-object.class-on-multi-valued-features-v3
add 8ff7162 [UIMA-3563] createTypePriorities accepts non-JCas classes
add ae8af74 Merge pull request #15 from apache/feature/UIMA-3563-createTypePriorities-accepts-non-JCas-classes-v3
add b7378ec [UIMA-5823] Add basic benchmarking module
add 0f83b24 [UIMA-5823] Add basic benchmarking module
add 00d6cc8 [UIMA-5823] Add basic benchmarking module
add 39a3bd3 [UIMA-5823] Add basic benchmarking module
add f98cb36 [UIMA-5823] Add basic benchmarking module
add 9e1cf4d [UIMA-5823] Add basic benchmarking module
add 79d5a3a [UIMA-5823] Add basic benchmarking module
add 290eb9e [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add b7df556 [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add acde4c7 [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add 27e12bd [UIMA-5792] Drop legacy module from uimaFIT v3
add 7942050 Merge pull request #20 from apache/feature/UIMA-5792-Drop-legacy-module-from-uimaFIT-v3
add eac4560 Merge branch '3.0.x' into feature/UIMA-5824-Run-JCasUtil-tests-against-equivalent-v3-selects
add 56ec3f3 [UIMA-5820] Add CasFactory
add ca53292 Merge branch '3.0.x' into feature/UIMA-5820-Add-CasFactory-v3
add bed7a64 Merge pull request #23 from apache/feature/UIMA-5820-Add-CasFactory-v3
add d512b43 Merge branch '3.0.x' into feature/UIMA-5824-Run-JCasUtil-tests-against-equivalent-v3-selects
add 837a3b8 [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add ea290cb [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add bc7115d [UIMA-5818] Use List instead of Collection where possible
add ca5a06e Merge branch '3.0.x' into feature/UIMA-5818-Use-List-instead-of-Collection-where-possible
add 717333f [UIMA-5818] Use List instead of Collection where possible
add 3d1a86d Merge branch '3.0.x' into feature/UIMA-5818-Use-List-instead-of-Collection-where-possible
add 89fb8e8 [UIMA-5818] Use List instead of Collection where possible
add fcd1169 Merge pull request #21 from apache/feature/UIMA-5818-Use-List-instead-of-Collection-where-possible
add 887a249 Merge branch '3.0.x' into feature/UIMA-5824-Run-JCasUtil-tests-against-equivalent-v3-selects
add c086986 [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add d3ca31a [UIMA-5824] Run JCasUtil tests against equivalent v3 selects
add 92708bc Merge pull request #19 from apache/feature/UIMA-5824-Run-JCasUtil-tests-against-equivalent-v3-selects
add 051524a Merge branch '3.0.x' into feature/UIMA-5823-Add-basic-benchmarking-module-v3
add 494a662 Merge pull request #17 from apache/feature/UIMA-5823-Add-basic-benchmarking-module-v3
add 8ce6b41 [UIMA-5823] Add basic benchmarking module
add 067be6a Merge pull request #25 from apache/feature/UIMA-5823-Add-basic-benchmarking-module-v3
add 1c9ec37 [UIMA-5810] Add contribution guidelines and PR template
add 45d9696 [UIMA-3562] Avoid throwing UIMAException
add 8609c43 Merge pull request #26 from apache/feature/UIMA-3562-Avoid-throwing-UIMAException
add a5efa4b Merge branch '3.0.x' into feature/UIMA-5810-Add-contribution-guidelines-and-PR-template-v3
add cddebe3 Merge pull request #27 from apache/feature/UIMA-5810-Add-contribution-guidelines-and-PR-template-v3
add 6d2c712 [UIMA-2903] List resources in a ResourceManager / remove hack in uimaFIT
add 9997ed6 Merge pull request #28 from apache/feature/UIMA-2903-List-resources-in-a-ResourceManager-v3
add 6d77093 [No Jira] Preparing release of uimaFIT 3.0.0-beta-1
add c5c4af6 [No Jira] Preparing release of uimaFIT 3.0.0-beta-1
add 97ffa3d [UIMA-5853] Java version for integration tests should match main target version
add 6a552b6 Merge pull request #32 from apache/feature/UIMA-5853-Java-version-for-integration-tests-should-match-main-target-version-v3
add 76dd0d8 Merge branch '3.0.x' into release/3.0.0-beta-1
add d4102c2 [UIMA-5854] Switch SCM info from SVN to GIT
add 0da2cfa Merge pull request #36 from apache/feature/UIMA-5854-Switch-SCM-info-from-SVN-to-GIT-v3
add 98ffc71 Merge branch '3.0.x' into release/3.0.0-beta-1
add 8018ec4 No Jira. Update Maven Release Plugin.
add 627dfd9 [maven-release-plugin] prepare release uimafit-3.0.0
add ba85718 [maven-release-plugin] prepare for next development iteration
add 207c066 No Jira. Reset version to 3.0.0-SNAPSHOT to prepare another release attempt.
add 63bcc3a [UIMA-5918] Upgrade to UIMAJ-Core 3.0.1
add 798478f [UIMA-5870] Documentation for addTypeSystemDescriptions in uimafit-maven-plugin is missing
add affaaed [UIMA-5918] Upgrade to UIMAJ-Core 3.0.1
add b3b3fc1 [No jira] Formatting broke the embedded Groovy script. Format again.
add f3a9517 [No jira] Added rat excludes for GitHub template files
add fd826b8 [UIMA-5918] Upgrade to UIMAJ-Core 3.0.1
add 9b2481d [UIMA-5929] Add exists() method to CasUtil
add 048164c No Jira - excluding issuesFixed folder from git
add 47f2205 Merge pull request #44 from apache/feature/UIMA-5929-Add-exists-method-to-CasUtil-3_0_x
add 6650b0d Merge branch '3.0.x' into release/3.0.0
add ac68325 [No jira] Update to latest UIMA Parent POM for generation of modern checksums
add 94e5c61 [maven-release-plugin] prepare release uimafit-3.0.0
add 9edff6d [maven-release-plugin] prepare for next development iteration
add 77b309c [UIMA-6006] Restore isMultiValuedFeature signature that works without a FS
add 916815e No issue. Formatted pom.xml.
add 24cc718 No issue. Formatted pom.xml.
add e1b058e No issue. Depend on UIMAJ Core 3.0.1 since the 3.0.1-SNAPSHOT builds are no longer available and 3.0.1 has already been released.
add 381f953 Merge pull request #45 from apache/No-issue-format-POM
add a2199bc Merge branch '3.0.x' into UIMA-6006-Restore-isMultiValuedFeature-signature-that-works-without-a-FS-3_0_x
add 9b9b478 Merge pull request #46 from apache/UIMA-6006-Restore-isMultiValuedFeature-signature-that-works-without-a-FS-3_0_x
add e4344a7 [UIMA-6004] Use SLF4J in unit tests and examples
add 710ac65 [UIMA-6005] Compare API changes against latest uimaFIT v2 release
add 576caae [UIMA-6007] Update to parent-pom 12
add 87c34d1 Merge pull request #47 from apache/UIMA-6007-Update-to-parent-pom-12-3_0_x
add 539bb7b Merge branch '3.0.x' into feature/UIMA-6005-Compare-API-changes-against-latest-uimaFIT-v2-release
add 55cf955 Merge pull request #50 from apache/feature/UIMA-6005-Compare-API-changes-against-latest-uimaFIT-v2-release
add 861b66a Merge branch '3.0.x' into feature/UIMA-6004-Use-SLF4J-in-unit-tests-and-examples
add ac933cb Merge pull request #52 from apache/feature/UIMA-6004-Use-SLF4J-in-unit-tests-and-examples
add e988ee0 [UIMA-6009] Use Maven dependency plugin to check dependencies
add 2a03aac Remove redundant declaration of Java target and source version. In the v2 branch, this is necessary because the benchmarking module requires Java 8, but in the v3 branch, Java 8 is the standard anyway.
add a16c3b6 Merge branch '3.0.x' into feature/No-Jira-Remove-redudant-declaration-of-Java-target-and-source-version
add 4295800 Merge pull request #53 from apache/feature/No-Jira-Remove-redudant-declaration-of-Java-target-and-source-version
add 1efa1cf Merge branch '3.0.x' into feature/UIMA-6009-Use-Maven-dependency-plugin-to-check-dependencies-3_0_x
add 8cae9a6 Merge pull request #54 from apache/feature/UIMA-6009-Use-Maven-dependency-plugin-to-check-dependencies-3_0_x
add b1506cf [UIMA-6010] Upgrade dependencies
add 1b1e6f0 [UIMA-6010] Upgrade dependencies
add d72e091 [UIMA-6010] Upgrade dependencies
add d1b34ed Merge pull request #55 from apache/feature/UIMA-6010-Upgrade-dependencies
add 2b2fc0d NO JIRA - Update years in NOTICE files
add 6e99668 Merge pull request #56 from apache/feature/NO-JIRA-Update-year-in-NOTICE-files
add 376511c [UIMA-6011] Always run RAT check
add 8fef2bc Merge pull request #57 from apache/feature/UIMA-6011-Always-run-RAT-check
add 0fd9cfc [UIMA-6012] Add api-change-report.html to the project
add e3a22f8 Merge pull request #58 from apache/feature/UIMA-6012-Add-api-change-report.html-to-the-project
add 3e0d1a3 Merge branch '3.0.x' into release/3.0.0
add 4129fa4 No Jira. Completed previously incomplete merge.
add a935f93 No Jira. Completed previously incomplete merge.
add f4700e3 [UIMA-6013] Adjust to getView throwing CASException
add ad270fe Merge pull request #59 from apache/feature/UIMA-6013-Adjust-to-getView-throwing-CASException
add 7a1c78c [UIMA-6021] Add selectSingleFS method to CasUtil
add c3f96d5 Merge pull request #60 from apache/feature/UIMA-6021-Add-selectSingleFS-method-to-CasUtil
add a4abd14 Revert "[UIMA-6013] Adjust to getView throwing CASException"
add 6155026 Merge pull request #61 from apache/bugfix/UIMA-6013-Adjust-to-getView-throwing-CASException
add aa91969 Merge branch '3.0.x' into release/3.0.0
add b247ed8 No Jira. Corrected Spring version in requirements.
add c8d0b3c [UIMA-6022] Upgrade to UIMA 3.0.2
add 15e7716 Merge pull request #62 from apache/bugfix/UIMA-6022-Upgrade-to-UIMA-3.0.2
add 2b854a8 Merge branch '3.0.x' into release/3.0.0
add 25205bc [UIMA-6010] Upgrade dependencies
add b103b05 No Jira - Elaborate migration guide and minor adjustments
add b6f596f [maven-release-plugin] prepare release uimafit-3.0.0
add 12f4d06 [maven-release-plugin] prepare for next development iteration
add d32887c Merge pull request #37 from apache/release/3.0.0
add a0d45ba No issue. Moving contribution guidelines to project root.
add 89b502f No issue. Moving contribution guidelines to project root.
add 8647022 Merge pull request #64 from apache/feature/No-issue-Move-contribution-guidelines-to-project-root
add d50a361 Merge branch '3.0.x' into feature/no-issue-upgrade-master-to-v3
add af9f462 Merge branch '3.0.x' into feature/no-issue-upgrade-master-to-v3
add 8bd12da Merge branch 'feature/no-issue-upgrade-master-to-v3' of https://github.com/apache/uima-uimafit into feature/no-issue-upgrade-master-to-v3
add 466c30a Merge branch 'feature/no-issue-upgrade-master-to-v3' of https://github.com/apache/uima-uimafit into feature/no-issue-upgrade-master-to-v3
add e41723d Merge branch 'feature/no-issue-upgrade-master-to-v3' of https://github.com/apache/uima-uimafit into feature/no-issue-upgrade-master-to-v3
add 580482d Merge pull request #69 from apache/feature/no-issue-upgrade-master-to-v3
add e562089 Merge branch 'master-v2' into sync-master-with-master-v2
add a8ec6f7 Merge pull request #73 from apache/sync-master-with-master-v2
add e3bfc80 Merge branch 'master-v2' into sync-v2-into-master
add 2fdf5bc [UIMA-5807] Support PEARs in AnalysisEngineFactory
add 100dd61 Merge pull request #77 from apache/sync-v2-into-master
add 1b317de Merge branch 'master-v2' into sync-v2-to-master
add f071cc4 Merge branch 'master-v2' into sync-v2-to-master
add 7d79a6d [NO JIRA] Update AssertJ and fix build.
add f5a79a0 Merge pull request #81 from apache/sync-v2-to-master
add 4ccc743 Merge branch 'master-v2' into sync-v2-to-master
add b21df4e Merge pull request #83 from apache/sync-v2-to-master
add 83fc731 Use HTTPS instead of HTTP to resolve dependencies
add fe82a17 Merge branch 'master-v2'
add 5df28b9 No issue. Fixed JavaDoc
add 462c239 Merge pull request #88 from apache/merge/master-v2-to-master
add c2e5063 [UIMA-6209] Add section on changes to ExternalResourceFactory to uimaFIT v3 migration
add bc58825 Merge pull request #89 from apache/feature/UIMA-6209-Add-section-on-changes-to-ExternalResourceFactory-to-uimaFIT-v3-migration
add a751791 [UIMA-6181]b Fix complaints about maven-plugin-plugin in Eclipse
add d548cbb No issue. Set version to 3.1.0-SNAPSHOT
add 9c8b9c2 No issue. Make japicmp pick up the right post-analysis file.
add bfa3ccb Merge pull request #91 from apache/UIMA-6181-Fix-complaints-about-maven-plugin-plugin-in-Eclipse
add 600dadc Merge branch 'master-v2' into sync-master-v2-to-master
add 3c01c83 [NO JIRA] Fix NOTICE file
add 6fe975d Merge pull request #94 from apache/sync-master-v2-to-master
add 31c20fb [UIMA-6216] Upgrade to UIMA Core 3.1.1
add a985e38 Merge pull request #95 from apache/UIMA-6216-Upgrade-to-UIMA-Core-3.1.1
add 2232897 [UIMA-5847] Remove UV3 bug workarounds in FSCollectionFactory
add ec191d4 Update an Eclipse metadata file.
add da79091 Merge pull request #96 from apache/UIMA-5847-Remove-UV3-bug-workarounds-in-FSCollectionFactory
add ef979ed [UIMA-6214] Method signature class in ExternalResourceFactory
add 1a32b8e [No Jira Issue Yet] Unit test illustrating error when binding resources to aggregates with nested dependent AEs. This error doesn't happen with uimaj-core-2.10.4 and uima-uimafit-2.4.0.
add 7137a02 [No Issue] Minor improvement of unit test illustrating error when binding resources to aggregates with nested dependent AEs.
add 1f1d4d8 [UIMA-6214] Method signature class in ExternalResourceFactory
add 576eb0b Merge pull request #97 from apache/UIMA-6214-Method-signature-clash-in-ExternalResourceFactory
add 7c3bd15 Merge branch 'master' into fix/JLL/use_https_to_resolve_dependencies
add f0148eb Merge pull request #84 from JLLeitschuh/fix/JLL/use_https_to_resolve_dependencies
add 6082fb7 Merge branch 'master-v2' into sync-master-v2-to-master
add bee0cbf Merge pull request #99 from apache/sync-master-v2-to-master
add d19e1b8 [NO JIRA] Updated README file for release.
add dea0587 [NO JIRA] Updated README file for release.
add cdce4ea [NO JIRA] Adjusted comparison version for API change report
add 61a004a [NO JIRA] Update documentation to changed API in ExternalResourceFactory and removed a spurious character
add 6b84ebe [maven-release-plugin] prepare release uimafit-3.1.0
add 7ccabb9 [maven-release-plugin] prepare for next development iteration
add 3800b5c [NO JIRA] Adjust UIMA version in the NOTICE file of the binary distribution
add a4afeee [maven-release-plugin] prepare release uimafit-3.1.0
add 101de41 [maven-release-plugin] prepare for next development iteration
add 3ecb52a Merge branch 'release/2.5.0' into release/3.1.0
add 53843df Merge branch 'release/2.5.0' into release/3.1.0
add 99b896d [maven-release-plugin] prepare release uimafit-3.1.0
add c365786 [maven-release-plugin] prepare for next development iteration
add 384af43 Merge branch 'master-v2' into sync-master-v2-to-master
add 97083f4 Merge pull request #105 from apache/sync-master-v2-to-master
add 606c7ec Merge branch 'master' into release/3.1.0
add d92a61b Merge pull request #108 from apache/release/3.1.0
add 506fe81 [UIMA-6232] Reduce overhead of createTypeSystemDescription() and friends
add 9db3f6c Merge pull request #109 from apache/feature/UIMA-6232-Reduce-overhead-of-createTypeSystemDescription-and-friends
add 1504c57 Merge branch 'master' into bugfix/UIMA-6240-Failure-to-resolve-type-system-imports-when-generating-descriptors
add 10029db Merge pull request #112 from apache/bugfix/UIMA-6240-Failure-to-resolve-type-system-imports-when-generating-descriptors
add ad26558 Merge branch 'master' into bugfix/UIMA-6242-uimaFIT-Maven-plugin-should-fail-on-error-by-default
add c81c382 Merge pull request #113 from apache/bugfix/UIMA-6242-uimaFIT-Maven-plugin-should-fail-on-error-by-default
add 5d78c43 [UIMA-6257] Jenkinsfile for uimaFIT
add 6bc7ae5 [UIMA-6257] Jenkinsfile for uimaFIT
add b52ab08 [UIMA-6257] Jenkinsfile for uimaFIT
add 49e6ceb [UIMA-6257] Jenkinsfile for uimaFIT
add a084b99 Merge pull request #114 from apache/UIMA-6257-Jenkinsfile-for-uimaFIT
add 4baa56a Merge branch 'master' into UIMA-6264-Switch-from-DocBook-to-Asciidoc
add 7ca3ccf [UIMA-6264] Switch from DocBook to Asciidoc
add e4043e7 Merge pull request #117 from apache/UIMA-6264-Switch-from-DocBook-to-Asciidoc
add 697ec0e Merge branch 'master' into UIMA-6263-CAS-validation-support-v3
add d76ffd1 Merge branch 'UIMA-6263-CAS-validation-support' into UIMA-6263-CAS-validation-support-v3
add fd5154f [UIMA-6263] CAS validation support
add 43b199f Merge pull request #120 from apache/UIMA-6263-CAS-validation-support-v3
add c252cf3 Merge branch 'master' into bugfix/UIMA-6275-InitializableFactory-is-not-smart-enough-to-find-a-suitable-classloader
add eda3678 No issue: ASF Jenkins Windows nodes seem to have trouble ('nohup' not found) - excluding Windows build nodes for the moment.
add e574f93 [UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
add 8d745ff Merge branch 'master-v2' into bugfix/UIMA-6275-InitializableFactory-is-not-smart-enough-to-find-a-suitable-classloader
add 004b242 Merge pull request #124 from apache/bugfix/UIMA-6275-InitializableFactory-is-not-smart-enough-to-find-a-suitable-classloader
add 8add6c4 [UIMA-6270] Add selectOverlapping to (J)CasUtil
add 2acbe9d [UIMA-6270] Add selectOverlapping to (J)CasUtil
add c64eff7 Merge pull request #122 from apache/UIMA-6270-Add-selectOverlapping-to-JCasUtil
new c0efa96 Merge branch 'master' into feature/UIMA-6227-Upgrade-to-xmlunit-2
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:
CONTRIBUTING.md | 3 +-
README | 36 +-
api-change-report.html | 13 +-
pom.xml | 56 +-
src/main/assembly/bin.xml | 28 +-
src/main/dist-bin/LICENSE | 2 +-
src/main/dist-bin/NOTICE | 16 +-
uimafit-assertj/pom.xml | 4 +-
uimafit-benchmark/pom.xml | 23 +-
.../org/apache/uima/fit/benchmark/Benchmark.java | 2 +-
.../uima/fit/benchmark/RunnableWithExceptions.java | 4 +-
.../uima/fit/benchmark/CasUtilBenchmark.java | 62 ++
.../uima/fit/benchmark/JCasUtilBenchmark.java | 69 +++
.../src/test/resources/simplelogger.properties | 1 +
uimafit-core/NOTICE | 4 +
uimafit-core/pom.xml | 52 +-
.../uima/fit/component/CasAnnotator_ImplBase.java | 15 -
.../component/CasCollectionReader_ImplBase.java | 12 +-
.../uima/fit/component/CasConsumer_ImplBase.java | 15 -
.../fit/component/CasFlowController_ImplBase.java | 15 -
.../uima/fit/component/CasMultiplier_ImplBase.java | 15 -
.../uima/fit/component/ExternalResourceAware.java | 8 +-
.../uima/fit/component/JCasAnnotator_ImplBase.java | 15 -
.../component/JCasCollectionReader_ImplBase.java | 13 +-
.../uima/fit/component/JCasConsumer_ImplBase.java | 15 -
.../fit/component/JCasFlowController_ImplBase.java | 15 -
.../fit/component/JCasMultiplier_ImplBase.java | 15 -
.../uima/fit/component/Resource_ImplBase.java | 14 +-
.../uima/fit/factory/AnalysisEngineFactory.java | 10 +-
.../org/apache/uima/fit/factory/CasFactory.java | 34 +-
.../uima/fit/factory/CollectionReaderFactory.java | 50 +-
.../fit/factory/ConfigurationParameterFactory.java | 13 +-
.../uima/fit/factory/ExternalResourceFactory.java | 371 ++++++++----
.../uima/fit/factory/FlowControllerFactory.java | 10 +-
.../apache/uima/fit/factory/FsIndexFactory.java | 10 +-
.../org/apache/uima/fit/factory/JCasFactory.java | 49 +-
.../uima/fit/factory/TypePrioritiesFactory.java | 19 +-
.../fit/factory/TypeSystemDescriptionFactory.java | 11 +-
.../apache/uima/fit/internal/ExtendedLogger.java | 450 ---------------
.../org/apache/uima/fit/internal/MetaDataUtil.java | 2 +-
.../uima/fit/internal/ResourceManagerFactory.java | 77 ++-
.../apache/uima/fit/pipeline/SimplePipeline.java | 47 +-
.../uima/fit/testing/factory/TokenBuilder.java | 1 -
.../apache/uima/fit/util/AnnotationPredicates.java | 217 +++++++
.../java/org/apache/uima/fit/util/CasUtil.java | 182 ++++--
.../apache/uima/fit/util/FSCollectionFactory.java | 322 +++++++----
.../main/java/org/apache/uima/fit/util/FSUtil.java | 53 +-
.../java/org/apache/uima/fit/util/JCasUtil.java | 54 +-
.../AnalysisEngineFactoryExternalResourceTest.java | 61 +-
...ollectionReaderFactoryExternalResourceTest.java | 7 +-
.../factory/ExternalResourceConfiguratorTest.java | 4 +-
.../fit/factory/ExternalResourceFactoryTest.java | 173 ++++--
.../FlowControllerFactoryExternalResourceTest.java | 5 +-
.../org/apache/uima/fit/factory/LoggingTest.java | 375 -------------
.../fit/factory/TypePrioritiesFactoryTest.java | 30 +-
.../apache/uima/fit/pipeline/JCasIterableTest.java | 10 +-
.../uima/fit/pipeline/SimplePipelineTest.java | 6 +-
.../uima/fit/util/AnnotationPredicatesTest.java | 382 +++++++++++++
.../uima/fit/util/FSCollectionFactoryTest.java | 76 ++-
.../java/org/apache/uima/fit/util/FSUtilTest.java | 27 +-
.../org/apache/uima/fit/util/JCasUtilTest.java | 291 +++++++++-
.../{JCasUtilTest.java => JCasUtilv3Test.java} | 385 +++++++------
.../resources/data/reference/JCasBuilderTest.dump | 22 +-
.../test/resources/data/reference/test.xmi.dump | 28 +-
uimafit-core/src/test/resources/log4j.properties | 5 -
.../src/test/resources/simplelogger.properties | 1 +
.../.settings/org.eclipse.core.resources.prefs | 1 +
uimafit-cpe/pom.xml | 82 +--
.../java/org/apache/uima/fit/cpe/CpePipeline.java | 27 +-
.../uima/fit/cpe/ExternalResourceFactoryTest.java | 30 +-
.../src/test/resources/simplelogger.properties | 1 +
uimafit-doc/pom.xml | 2 +-
.../asciidoc/tools.uimafit.externalresources.adoc | 2 +-
.../src/main/asciidoc/tools.uimafit.migration.adoc | 154 ++---
{uimafit-junit => uimafit-docbook}/pom.xml | 31 +-
.../tools.uimafit.configurationparameters.xml | 185 ++++++
.../docbook/tools.uimafit.externalresources.xml | 321 +++++++++++
.../src/docbook/tools.uimafit.migration.xml | 273 +++++++++
uimafit-examples/NOTICE | 3 +
uimafit-examples/pom.xml | 267 ++++-----
.../examples/resource/ExternalResourceExample.java | 7 +-
.../resource/ExternalResourceExample2.java | 7 +-
.../resource/ExternalResourceExample3.java | 6 +-
.../examples/tutorial/ex2/RoomNumberAnnotator.java | 3 +-
.../tutorial/ex6/UimaAcronymAnnotator.java | 8 +-
.../tutorial/ex6/UimaMeetingAnnotator.java | 8 +-
.../src/main/resources/simplelogger.properties | 1 +
.../fit/examples/tutorial/ex6/Example6Test.java | 8 +-
uimafit-junit/pom.xml | 4 +-
.../.settings/org.eclipse.jdt.core.prefs | 288 ----------
.../.settings/org.eclipse.jdt.ui.prefs | 3 -
uimafit-legacy-support/NOTICE | 8 -
...marker-file-identifying-api-compatibility-check | 1 -
uimafit-legacy-support/pom.xml | 144 -----
.../uima/fit/legacy/AnnotationConverter.java | 44 --
.../uima/fit/legacy/LegacySupportPluginImpl.java | 158 ------
.../fit/legacy/converter/AnnotationLiteral.java | 277 ---------
.../converter/ConfigurationParameterConverter.java | 98 ----
.../ContextlessAnnotationConverterBase.java | 41 --
.../converter/ExternalResourceConverter.java | 92 ---
.../converter/FsIndexCollectionConverter.java | 67 ---
.../fit/legacy/converter/FsIndexConverter.java | 92 ---
.../fit/legacy/converter/FsIndexKeyConverter.java | 63 ---
.../legacy/converter/NoConversionConverter.java | 59 --
.../converter/OperationalPropertiesConverter.java | 67 ---
.../legacy/converter/SofaCapabilityConverter.java | 75 ---
.../legacy/converter/TypeCapabilityConverter.java | 75 ---
.../org/apache/uima/fit/ComponentTestBase.java | 89 ---
.../uima/fit/component/CasDumpWriterTest.java | 61 --
.../JCasCollectionReader_ImplBaseTest.java | 88 ---
.../fit/component/ViewCreatorAnnotatorTest.java | 182 ------
.../fit/component/ViewTextCopierAnnotatorTest.java | 92 ---
.../ConfigurationParameterInitializerTest.java | 472 ----------------
.../apache/uima/fit/data/CreateSampleXCASFile.java | 59 --
.../apache/uima/fit/data/CreateSampleXMIFile.java | 54 --
.../uima/fit/descriptor/TypeCapabilityTest.java | 57 --
.../uima/fit/factory/AggregateBuilderTest.java | 209 -------
.../uima/fit/factory/AggregateWithReaderTest.java | 198 -------
.../AnalysisEngineFactoryExternalResourceTest.java | 404 --------------
.../fit/factory/AnalysisEngineFactoryTest.java | 467 ----------------
.../uima/fit/factory/AnnotationFactoryTest.java | 45 --
...ollectionReaderFactoryExternalResourceTest.java | 91 ---
.../fit/factory/CollectionReaderFactoryTest.java | 127 -----
.../factory/ConfigurationParameterFactoryTest.java | 221 --------
.../factory/ExternalResourceConfiguratorTest.java | 82 ---
.../fit/factory/ExternalResourceFactoryTest.java | 411 --------------
.../FlowControllerFactoryExternalResourceTest.java | 93 ---
.../uima/fit/factory/FsIndexFactoryTest.java | 132 -----
.../apache/uima/fit/factory/JCasBuilderTest.java | 73 ---
.../apache/uima/fit/factory/JCasFactoryTest.java | 71 ---
.../org/apache/uima/fit/factory/LoggingTest.java | 311 -----------
.../ResourceCreationSpecifierFactoryTest.java | 56 --
.../uima/fit/factory/SofaMappingFactoryTest.java | 40 --
.../fit/factory/TypePrioritiesFactoryTest.java | 47 --
.../factory/TypeSystemDescriptionFactoryTest.java | 48 --
.../uima/fit/factory/UimaContextFactoryTest.java | 70 ---
.../initializable/InitializableFactoryTest.java | 123 ----
.../uima/fit/factory/testAes/Annotator1.java | 50 --
.../uima/fit/factory/testAes/Annotator2.java | 63 ---
.../uima/fit/factory/testAes/Annotator3.java | 57 --
.../uima/fit/factory/testAes/Annotator4.java | 45 --
.../apache/uima/fit/factory/testAes/FlowAE1.java | 38 --
.../apache/uima/fit/factory/testAes/FlowAE2.java | 45 --
.../apache/uima/fit/factory/testAes/FlowAE3.java | 48 --
.../uima/fit/factory/testAes/ParameterizedAE.java | 409 --------------
.../uima/fit/factory/testAes/ParameterizedAE2.java | 56 --
.../testAes/ReversableTestFlowController.java | 88 ---
.../apache/uima/fit/factory/testAes/ViewNames.java | 38 --
.../fit/factory/testCrs/SingleFileXReader.java | 127 -----
.../fit/factory/testCrs/SingleFileXReaderTest.java | 117 ----
.../fit/factory/testRes/TestExternalResource.java | 41 --
.../factory/testRes/TestSharedResourceObject.java | 48 --
.../uima/fit/testing/factory/TokenBuilderTest.java | 242 --------
.../java/org/apache/uima/fit/util/CasUtilTest.java | 188 -------
.../apache/uima/fit/util/ContainmentIndexTest.java | 69 ---
.../apache/uima/fit/util/DisableLoggingTest.java | 106 ----
.../uima/fit/util/FSCollectionFactoryTest.java | 211 -------
.../org/apache/uima/fit/util/HideOutputTest.java | 72 ---
.../org/apache/uima/fit/util/JCasIterableTest.java | 43 --
.../org/apache/uima/fit/util/JCasUtilTest.java | 621 ---------------------
.../org/apache/uima/fit/util/LocaleUtilTest.java | 64 ---
.../apache/uima/fit/util/SimplePipelineTest.java | 48 --
.../org/apache/uima/fit/util/TypeSystemUtil.java | 46 --
.../resources/META-INF/org.uimafit/fsindexes.txt | 1 -
.../test/resources/META-INF/org.uimafit/types.txt | 1 -
.../resources/data/descriptor/DefaultValueAE1.xml | 36 --
.../resources/data/descriptor/DefaultValueAE2.xml | 36 --
.../src/test/resources/data/descriptor/README | 3 -
.../src/test/resources/data/docs/bad.xcas | 1 -
.../src/test/resources/data/docs/test.xcas | 1 -
.../src/test/resources/data/docs/test.xmi | 1 -
.../test/resources/data/docs/unix-newlines.txt.bin | 8 -
.../resources/data/docs/windows-newlines.txt.bin | 9 -
.../resources/data/reference/JCasBuilderTest.dump | 69 ---
.../test/resources/data/reference/test.xmi.dump | 92 ---
.../apache/uima/fit/component/NoOpAnnotator.xml | 48 --
.../uima/fit/factory/testCrs/SingleFileXReader.xml | 60 --
.../apache/uima/fit/index/AutoImportableIndex.xml | 38 --
.../org/apache/uima/fit/type/AnalyzedText.xml | 39 --
.../org/apache/uima/fit/type/Sentence.xml | 32 --
.../resources/org/apache/uima/fit/type/Token.xml | 44 --
uimafit-maven-plugin/pom.xml | 14 +-
uimafit-maven-plugin/src/it/default/pom.xml | 110 ++--
.../org/apache/uima/fit/maven/EnhanceMojo.java | 7 +-
.../uima/fit/maven/GenerateDescriptorsMojo.java | 2 +-
.../java/org/apache/uima/fit/maven/util/Util.java | 2 +-
uimafit-parent/pom.xml | 97 ++--
uimafit-spring/NOTICE | 3 +
uimafit-spring/pom.xml | 111 ++--
.../spring/SpringContextResourceManagerTest.java | 4 +-
.../src/test/resources/simplelogger.properties | 1 +
191 files changed, 3779 insertions(+), 12039 deletions(-)
create mode 100644 uimafit-benchmark/src/test/resources/simplelogger.properties
delete mode 100644 uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
create mode 100644 uimafit-core/src/main/java/org/apache/uima/fit/util/AnnotationPredicates.java
delete mode 100644 uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
create mode 100644 uimafit-core/src/test/java/org/apache/uima/fit/util/AnnotationPredicatesTest.java
copy uimafit-core/src/test/java/org/apache/uima/fit/util/{JCasUtilTest.java => JCasUtilv3Test.java} (63%)
delete mode 100644 uimafit-core/src/test/resources/log4j.properties
create mode 100644 uimafit-core/src/test/resources/simplelogger.properties
create mode 100644 uimafit-cpe/src/test/resources/simplelogger.properties
copy {uimafit-junit => uimafit-docbook}/pom.xml (57%)
create mode 100644 uimafit-docbook/src/docbook/tools.uimafit.configurationparameters.xml
create mode 100644 uimafit-docbook/src/docbook/tools.uimafit.externalresources.xml
create mode 100644 uimafit-docbook/src/docbook/tools.uimafit.migration.xml
create mode 100644 uimafit-examples/src/main/resources/simplelogger.properties
delete mode 100644 uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs
delete mode 100644 uimafit-legacy-support/.settings/org.eclipse.jdt.ui.prefs
delete mode 100644 uimafit-legacy-support/NOTICE
delete mode 100644 uimafit-legacy-support/marker-file-identifying-api-compatibility-check
delete mode 100644 uimafit-legacy-support/pom.xml
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/AnnotationConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/AnnotationLiteral.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ConfigurationParameterConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ContextlessAnnotationConverterBase.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/ExternalResourceConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexCollectionConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/FsIndexKeyConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/NoConversionConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/OperationalPropertiesConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/SofaCapabilityConverter.java
delete mode 100644 uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/TypeCapabilityConverter.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/ComponentTestBase.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/CasDumpWriterTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBaseTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/ViewTextCopierAnnotatorTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializerTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/data/CreateSampleXCASFile.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/data/CreateSampleXMIFile.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/descriptor/TypeCapabilityTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/AggregateBuilderTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/AggregateWithReaderTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/AnnotationFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryExternalResourceTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceConfiguratorTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FlowControllerFactoryExternalResourceTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/JCasFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ResourceCreationSpecifierFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/SofaMappingFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/UimaContextFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/Annotator1.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/Annotator2.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/Annotator3.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/Annotator4.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE1.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE2.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE3.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE2.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testAes/ViewNames.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReaderTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/CasUtilTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/ContainmentIndexTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/DisableLoggingTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/HideOutputTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/JCasIterableTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/LocaleUtilTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java
delete mode 100644 uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/TypeSystemUtil.java
delete mode 100644 uimafit-legacy-support/src/test/resources/META-INF/org.uimafit/fsindexes.txt
delete mode 100644 uimafit-legacy-support/src/test/resources/META-INF/org.uimafit/types.txt
delete mode 100644 uimafit-legacy-support/src/test/resources/data/descriptor/DefaultValueAE1.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/data/descriptor/DefaultValueAE2.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/data/descriptor/README
delete mode 100644 uimafit-legacy-support/src/test/resources/data/docs/bad.xcas
delete mode 100644 uimafit-legacy-support/src/test/resources/data/docs/test.xcas
delete mode 100644 uimafit-legacy-support/src/test/resources/data/docs/test.xmi
delete mode 100644 uimafit-legacy-support/src/test/resources/data/docs/unix-newlines.txt.bin
delete mode 100644 uimafit-legacy-support/src/test/resources/data/docs/windows-newlines.txt.bin
delete mode 100644 uimafit-legacy-support/src/test/resources/data/reference/JCasBuilderTest.dump
delete mode 100644 uimafit-legacy-support/src/test/resources/data/reference/test.xmi.dump
delete mode 100644 uimafit-legacy-support/src/test/resources/org/apache/uima/fit/component/NoOpAnnotator.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/org/apache/uima/fit/type/Sentence.xml
delete mode 100644 uimafit-legacy-support/src/test/resources/org/apache/uima/fit/type/Token.xml
create mode 100644 uimafit-spring/src/test/resources/simplelogger.properties
[uima-uimafit] 01/01: Merge branch 'master' into
feature/UIMA-6227-Upgrade-to-xmlunit-2
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch feature/UIMA-6227-Upgrade-to-xmlunit-2
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit c0efa96b91559659e21114db5ffef2fce61a1ba7
Merge: 121adc4 c64eff7
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Sun Oct 18 22:58:25 2020 +0200
Merge branch 'master' into feature/UIMA-6227-Upgrade-to-xmlunit-2
* master: (134 commits)
[UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
No issue: ASF Jenkins Windows nodes seem to have trouble ('nohup' not found) - excluding Windows build nodes for the moment.
[UIMA-6270] Add selectOverlapping to (J)CasUtil
[UIMA-6270] Add selectOverlapping to (J)CasUtil
[UIMA-6263] CAS validation support
[UIMA-6264] Switch from DocBook to Asciidoc
[UIMA-6257] Jenkinsfile for uimaFIT
[UIMA-6257] Jenkinsfile for uimaFIT
[UIMA-6257] Jenkinsfile for uimaFIT
[UIMA-6257] Jenkinsfile for uimaFIT
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-3.1.0
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-3.1.0
[NO JIRA] Adjust UIMA version in the NOTICE file of the binary distribution
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-3.1.0
[NO JIRA] Update documentation to changed API in ExternalResourceFactory and removed a spurious character
[NO JIRA] Adjusted comparison version for API change report
[NO JIRA] Updated README file for release.
...
% Conflicts:
% uimafit-core/pom.xml
% uimafit-maven-plugin/pom.xml
CONTRIBUTING.md | 3 +-
README | 36 +-
api-change-report.html | 13 +-
pom.xml | 56 +-
src/main/assembly/bin.xml | 28 +-
src/main/dist-bin/LICENSE | 2 +-
src/main/dist-bin/NOTICE | 16 +-
uimafit-assertj/pom.xml | 4 +-
uimafit-benchmark/pom.xml | 23 +-
.../org/apache/uima/fit/benchmark/Benchmark.java | 2 +-
.../uima/fit/benchmark/RunnableWithExceptions.java | 4 +-
.../uima/fit/benchmark/CasUtilBenchmark.java | 62 ++
.../uima/fit/benchmark/JCasUtilBenchmark.java | 69 +++
.../src/test/resources/simplelogger.properties | 1 +
uimafit-core/NOTICE | 4 +
uimafit-core/pom.xml | 52 +-
.../uima/fit/component/CasAnnotator_ImplBase.java | 15 -
.../component/CasCollectionReader_ImplBase.java | 12 +-
.../uima/fit/component/CasConsumer_ImplBase.java | 15 -
.../fit/component/CasFlowController_ImplBase.java | 15 -
.../uima/fit/component/CasMultiplier_ImplBase.java | 15 -
.../uima/fit/component/ExternalResourceAware.java | 8 +-
.../uima/fit/component/JCasAnnotator_ImplBase.java | 15 -
.../component/JCasCollectionReader_ImplBase.java | 13 +-
.../uima/fit/component/JCasConsumer_ImplBase.java | 15 -
.../fit/component/JCasFlowController_ImplBase.java | 15 -
.../fit/component/JCasMultiplier_ImplBase.java | 15 -
.../uima/fit/component/Resource_ImplBase.java | 14 +-
.../uima/fit/factory/AnalysisEngineFactory.java | 10 +-
.../org/apache/uima/fit/factory/CasFactory.java | 34 +-
.../uima/fit/factory/CollectionReaderFactory.java | 50 +-
.../fit/factory/ConfigurationParameterFactory.java | 13 +-
.../uima/fit/factory/ExternalResourceFactory.java | 371 ++++++++----
.../uima/fit/factory/FlowControllerFactory.java | 10 +-
.../apache/uima/fit/factory/FsIndexFactory.java | 10 +-
.../org/apache/uima/fit/factory/JCasFactory.java | 49 +-
.../uima/fit/factory/TypePrioritiesFactory.java | 19 +-
.../fit/factory/TypeSystemDescriptionFactory.java | 11 +-
.../apache/uima/fit/internal/ExtendedLogger.java | 450 ---------------
.../org/apache/uima/fit/internal/MetaDataUtil.java | 2 +-
.../uima/fit/internal/ResourceManagerFactory.java | 77 ++-
.../apache/uima/fit/pipeline/SimplePipeline.java | 47 +-
.../uima/fit/testing/factory/TokenBuilder.java | 1 -
.../apache/uima/fit/util/AnnotationPredicates.java | 217 +++++++
.../java/org/apache/uima/fit/util/CasUtil.java | 182 ++++--
.../apache/uima/fit/util/FSCollectionFactory.java | 322 +++++++----
.../main/java/org/apache/uima/fit/util/FSUtil.java | 53 +-
.../java/org/apache/uima/fit/util/JCasUtil.java | 54 +-
.../AnalysisEngineFactoryExternalResourceTest.java | 61 +-
...ollectionReaderFactoryExternalResourceTest.java | 7 +-
.../factory/ExternalResourceConfiguratorTest.java | 4 +-
.../fit/factory/ExternalResourceFactoryTest.java | 173 ++++--
.../FlowControllerFactoryExternalResourceTest.java | 5 +-
.../org/apache/uima/fit/factory/LoggingTest.java | 375 -------------
.../fit/factory/TypePrioritiesFactoryTest.java | 30 +-
.../apache/uima/fit/pipeline/JCasIterableTest.java | 10 +-
.../uima/fit/pipeline/SimplePipelineTest.java | 6 +-
.../uima/fit/util/AnnotationPredicatesTest.java | 382 +++++++++++++
.../uima/fit/util/FSCollectionFactoryTest.java | 76 ++-
.../java/org/apache/uima/fit/util/FSUtilTest.java | 27 +-
.../org/apache/uima/fit/util/JCasUtilTest.java | 291 +++++++++-
.../{JCasUtilTest.java => JCasUtilv3Test.java} | 385 +++++++------
.../resources/data/reference/JCasBuilderTest.dump | 22 +-
.../test/resources/data/reference/test.xmi.dump | 28 +-
uimafit-core/src/test/resources/log4j.properties | 5 -
.../src/test/resources/simplelogger.properties | 1 +
.../.settings/org.eclipse.core.resources.prefs | 1 +
uimafit-cpe/pom.xml | 82 +--
.../java/org/apache/uima/fit/cpe/CpePipeline.java | 27 +-
.../uima/fit/cpe/ExternalResourceFactoryTest.java | 30 +-
.../src/test/resources/simplelogger.properties | 1 +
uimafit-doc/pom.xml | 2 +-
.../asciidoc/tools.uimafit.externalresources.adoc | 2 +-
.../src/main/asciidoc/tools.uimafit.migration.adoc | 154 ++---
{uimafit-junit => uimafit-docbook}/pom.xml | 31 +-
.../tools.uimafit.configurationparameters.xml | 185 ++++++
.../docbook/tools.uimafit.externalresources.xml | 321 +++++++++++
.../src/docbook/tools.uimafit.migration.xml | 273 +++++++++
uimafit-examples/NOTICE | 3 +
uimafit-examples/pom.xml | 267 ++++-----
.../examples/resource/ExternalResourceExample.java | 7 +-
.../resource/ExternalResourceExample2.java | 7 +-
.../resource/ExternalResourceExample3.java | 6 +-
.../examples/tutorial/ex2/RoomNumberAnnotator.java | 3 +-
.../tutorial/ex6/UimaAcronymAnnotator.java | 8 +-
.../tutorial/ex6/UimaMeetingAnnotator.java | 8 +-
.../src/main/resources/simplelogger.properties | 1 +
.../fit/examples/tutorial/ex6/Example6Test.java | 8 +-
uimafit-junit/pom.xml | 4 +-
.../.settings/org.eclipse.jdt.core.prefs | 288 ----------
.../.settings/org.eclipse.jdt.ui.prefs | 3 -
uimafit-legacy-support/NOTICE | 8 -
...marker-file-identifying-api-compatibility-check | 1 -
uimafit-legacy-support/pom.xml | 144 -----
.../uima/fit/legacy/AnnotationConverter.java | 44 --
.../uima/fit/legacy/LegacySupportPluginImpl.java | 158 ------
.../fit/legacy/converter/AnnotationLiteral.java | 277 ---------
.../converter/ConfigurationParameterConverter.java | 98 ----
.../ContextlessAnnotationConverterBase.java | 41 --
.../converter/ExternalResourceConverter.java | 92 ---
.../converter/FsIndexCollectionConverter.java | 67 ---
.../fit/legacy/converter/FsIndexConverter.java | 92 ---
.../fit/legacy/converter/FsIndexKeyConverter.java | 63 ---
.../legacy/converter/NoConversionConverter.java | 59 --
.../converter/OperationalPropertiesConverter.java | 67 ---
.../legacy/converter/SofaCapabilityConverter.java | 75 ---
.../legacy/converter/TypeCapabilityConverter.java | 75 ---
.../org/apache/uima/fit/ComponentTestBase.java | 89 ---
.../uima/fit/component/CasDumpWriterTest.java | 61 --
.../JCasCollectionReader_ImplBaseTest.java | 88 ---
.../fit/component/ViewCreatorAnnotatorTest.java | 182 ------
.../fit/component/ViewTextCopierAnnotatorTest.java | 92 ---
.../ConfigurationParameterInitializerTest.java | 472 ----------------
.../apache/uima/fit/data/CreateSampleXCASFile.java | 59 --
.../apache/uima/fit/data/CreateSampleXMIFile.java | 54 --
.../uima/fit/descriptor/TypeCapabilityTest.java | 57 --
.../uima/fit/factory/AggregateBuilderTest.java | 209 -------
.../uima/fit/factory/AggregateWithReaderTest.java | 198 -------
.../AnalysisEngineFactoryExternalResourceTest.java | 404 --------------
.../fit/factory/AnalysisEngineFactoryTest.java | 467 ----------------
.../uima/fit/factory/AnnotationFactoryTest.java | 45 --
...ollectionReaderFactoryExternalResourceTest.java | 91 ---
.../fit/factory/CollectionReaderFactoryTest.java | 127 -----
.../factory/ConfigurationParameterFactoryTest.java | 221 --------
.../factory/ExternalResourceConfiguratorTest.java | 82 ---
.../fit/factory/ExternalResourceFactoryTest.java | 411 --------------
.../FlowControllerFactoryExternalResourceTest.java | 93 ---
.../uima/fit/factory/FsIndexFactoryTest.java | 132 -----
.../apache/uima/fit/factory/JCasBuilderTest.java | 73 ---
.../apache/uima/fit/factory/JCasFactoryTest.java | 71 ---
.../org/apache/uima/fit/factory/LoggingTest.java | 311 -----------
.../ResourceCreationSpecifierFactoryTest.java | 56 --
.../uima/fit/factory/SofaMappingFactoryTest.java | 40 --
.../fit/factory/TypePrioritiesFactoryTest.java | 47 --
.../factory/TypeSystemDescriptionFactoryTest.java | 48 --
.../uima/fit/factory/UimaContextFactoryTest.java | 70 ---
.../initializable/InitializableFactoryTest.java | 123 ----
.../uima/fit/factory/testAes/Annotator1.java | 50 --
.../uima/fit/factory/testAes/Annotator2.java | 63 ---
.../uima/fit/factory/testAes/Annotator3.java | 57 --
.../uima/fit/factory/testAes/Annotator4.java | 45 --
.../apache/uima/fit/factory/testAes/FlowAE1.java | 38 --
.../apache/uima/fit/factory/testAes/FlowAE2.java | 45 --
.../apache/uima/fit/factory/testAes/FlowAE3.java | 48 --
.../uima/fit/factory/testAes/ParameterizedAE.java | 409 --------------
.../uima/fit/factory/testAes/ParameterizedAE2.java | 56 --
.../testAes/ReversableTestFlowController.java | 88 ---
.../apache/uima/fit/factory/testAes/ViewNames.java | 38 --
.../fit/factory/testCrs/SingleFileXReader.java | 127 -----
.../fit/factory/testCrs/SingleFileXReaderTest.java | 117 ----
.../fit/factory/testRes/TestExternalResource.java | 41 --
.../factory/testRes/TestSharedResourceObject.java | 48 --
.../uima/fit/testing/factory/TokenBuilderTest.java | 242 --------
.../java/org/apache/uima/fit/util/CasUtilTest.java | 188 -------
.../apache/uima/fit/util/ContainmentIndexTest.java | 69 ---
.../apache/uima/fit/util/DisableLoggingTest.java | 106 ----
.../uima/fit/util/FSCollectionFactoryTest.java | 211 -------
.../org/apache/uima/fit/util/HideOutputTest.java | 72 ---
.../org/apache/uima/fit/util/JCasIterableTest.java | 43 --
.../org/apache/uima/fit/util/JCasUtilTest.java | 621 ---------------------
.../org/apache/uima/fit/util/LocaleUtilTest.java | 64 ---
.../apache/uima/fit/util/SimplePipelineTest.java | 48 --
.../org/apache/uima/fit/util/TypeSystemUtil.java | 46 --
.../resources/META-INF/org.uimafit/fsindexes.txt | 1 -
.../test/resources/META-INF/org.uimafit/types.txt | 1 -
.../resources/data/descriptor/DefaultValueAE1.xml | 36 --
.../resources/data/descriptor/DefaultValueAE2.xml | 36 --
.../src/test/resources/data/descriptor/README | 3 -
.../src/test/resources/data/docs/bad.xcas | 1 -
.../src/test/resources/data/docs/test.xcas | 1 -
.../src/test/resources/data/docs/test.xmi | 1 -
.../test/resources/data/docs/unix-newlines.txt.bin | 8 -
.../resources/data/docs/windows-newlines.txt.bin | 9 -
.../resources/data/reference/JCasBuilderTest.dump | 69 ---
.../test/resources/data/reference/test.xmi.dump | 92 ---
.../apache/uima/fit/component/NoOpAnnotator.xml | 48 --
.../uima/fit/factory/testCrs/SingleFileXReader.xml | 60 --
.../apache/uima/fit/index/AutoImportableIndex.xml | 38 --
.../org/apache/uima/fit/type/AnalyzedText.xml | 39 --
.../org/apache/uima/fit/type/Sentence.xml | 32 --
.../resources/org/apache/uima/fit/type/Token.xml | 44 --
uimafit-maven-plugin/pom.xml | 14 +-
uimafit-maven-plugin/src/it/default/pom.xml | 110 ++--
.../org/apache/uima/fit/maven/EnhanceMojo.java | 7 +-
.../uima/fit/maven/GenerateDescriptorsMojo.java | 2 +-
.../java/org/apache/uima/fit/maven/util/Util.java | 2 +-
uimafit-parent/pom.xml | 97 ++--
uimafit-spring/NOTICE | 3 +
uimafit-spring/pom.xml | 111 ++--
.../spring/SpringContextResourceManagerTest.java | 4 +-
.../src/test/resources/simplelogger.properties | 1 +
191 files changed, 3779 insertions(+), 12039 deletions(-)