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 2023/01/12 06:29:01 UTC

[uima-uimaj] branch bugfix/272-select-on-FSArray-seems-broken updated (bb25f8ac4 -> 2ff1a07e8)

This is an automated email from the ASF dual-hosted git repository.

rec pushed a change to branch bugfix/272-select-on-FSArray-seems-broken
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


    from bb25f8ac4 Issue #272: select on FSArray seems broken
     add c459048a6 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add f415f1fbc [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add d238dfd56 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 5535ecf14 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 989a9427a [UIMA-6440] Stage release artifacts as part of the build
     add 921f7ed39 [UIMA-6440] Stage release artifacts as part of the build
     add 2173f3fe0 Merge pull request #199 from apache/feature/UIMA-6440-Stage-release-artifacts-as-part-of-the-build
     add 9d0a4ea5f Merge branch 'main' into UIMA-6395-Apache-UIMA-Java-SDK-3.3.0-release
     add 186a02943 Merge pull request #187 from apache/UIMA-6395-Apache-UIMA-Java-SDK-3.3.0-release
     add 8cc81d9ef [NO JIRA] Set version to 3.4.0-SNAPSHOT
     add be35b3e85 [NO JIRA] Set version to 3.4.0-SNAPSHOT
     add e31cd1adb Merge pull request #201 from apache/no-jira-set-version
     add c043b8886 Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add 46464f4a4 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 961a130f5 [UIMA-6454] Update dependencies (UIMA Java SDK 3.3.1)
     add ae4905d49 Merge pull request #202 from apache/refactoring/UIMA-6454-Update-dependencies
     add 48d85a90e Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add 85301afa8 [UIMA-6438] Add asf.yaml files to UIMA repos
     add 40a736681 [UIMA-6443] Fresh Eclipse update site for every release
     add 6f2abc07e [UIMA-6443] Fresh Eclipse update site for every release
     add dbe58d15b [UIMA-6443] Fresh Eclipse update site for every release
     add 60ad1aa62 [UIMA-6443] Fresh Eclipse update site for every release
     add 7d1ca4529 [UIMA-6443] Fresh Eclipse update site for every release
     add 24b88ef72 [UIMA-6443] Fresh Eclipse update site for every release
     add b961af68f [UIMA-6443] Fresh Eclipse update site for every release
     add fe3ebc3a5 [UIMA-6443] Fresh Eclipse update site for every release
     add bad71244e [UIMA-6443] Fresh Eclipse update site for every release
     add e58d34df1 [UIMA-6443] Fresh Eclipse update site for every release
     add a2f213235 [UIMA-6443] Fresh Eclipse update site for every release
     add 9c89bb534 [UIMA-6443] Fresh Eclipse update site for every release
     add 83933a639 [UIMA-6443] Fresh Eclipse update site for every release
     add 83afb56c0 [UIMA-6443] Fresh Eclipse update site for every release
     add 532cc908c Merge branch 'main' into refactoring/UIMA-6443-Fresh-Eclipse-update-site-for-every-release
     add 681f7525e [UIMA-6443] Fresh Eclipse update site for every release
     add 47efebe7c [UIMA-6443] Fresh Eclipse update site for every release
     add 8b64502a8 [UIMA-6443] Fresh Eclipse update site for every release
     add 7e03f1c2b Merge branch 'main' into refactoring/UIMA-6443-Fresh-Eclipse-update-site-for-every-release
     add 016e151ff Merge pull request #200 from apache/refactoring/UIMA-6443-Fresh-Eclipse-update-site-for-every-release
     add 45cfdc523 Merge branch 'main' into refactoring/UIMA-6438-Add-asf.yaml-files-to-UIMA-repos
     add 59d38c22b Merge pull request #203 from apache/refactoring/UIMA-6438-Add-asf.yaml-files-to-UIMA-repos
     add d6436fbf6 Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add d11d45d18 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 417336421 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 1bc8b6b8c [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 9df151bf0 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 54eeebd85 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add ec3ba0017 [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0)
     add 4e9c4e0a4 Merge branch 'main' into refactoring/UIMA-6459-Upgrade-dependencies
     add e360ce2d0 [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0)
     add e8e979e7d [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0)
     add a47b98b62 Merge pull request #204 from apache/refactoring/UIMA-6459-Upgrade-dependencies
     add a9f392b18 Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add 5bedbc379 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 0f1f30811 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 4c3de6e19 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add b8534b849 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 4db01d8c1 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 097a08315 [UIMA-6462] Avoid deploy broken checksum files for p2content.xml and artifacts.xml in feature modules
     add 11dcc085a Merge pull request #205 from apache/bugfix/UIMA-6462-Avoid-deploy-broken-checksum-files-for-p2content.xml-and-artifacts.xml-in-feature-modules
     add e2b8699c9 Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add 2a5016f2d [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add 782a40c90 [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8
     add e70b51067 Merge pull request #206 from apache/refactoring/UIMA-6463-Use-toolchains-to-ensure-compatibility-with-Java-1_8
     add 13bbcf8e2 Merge branch 'main' into refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add a45b672c7 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add b59687cd6 Merge pull request #197 from apache/refactoring/UIMA-6436-Move-maintainer-documentation-from-website-into-maintainer-guide
     add e8ed90b7f [UIMA-6459] Upgrade dependencies
     add 6ab37d252 [UIMA-6436] Move maintainer documentation from website into maintainer guide
     add fb5dd1993 Merge pull request #207 from apache/refactoring/UIMA-6459-Upgrade-dependencies
     add 09d00076a Merge branch 'main' into UIMA-6469-Cleaning-up-file-handling-code
     add c4bfac4f4 Merge branch 'main' into no-jira/update-autoformatting
     add a5be117ce Merge pull request #212 from apache/no-jira/update-autoformatting
     add 8fe96c024 Merge branch 'main' into UIMA-6469-Cleaning-up-file-handling-code
     add 576053393 Merge pull request #211 from apache/UIMA-6469-Cleaning-up-file-handling-code
     add 3111f48a4 [UIMA-6474] Switch to getDataPathElements() in UimaContext
     add 4d59b0fa6 [UIMA-6474] Switch to getDataPathElements() in UimaContext
     add 849ace5f5 [No Jira] Remove outdated figure
     add 04db2a5b4 Merge pull request #214 from apache/refactoring/no-jira-remove-outdated-unused-figure
     add a42977408 Merge branch 'main' into feature/UIMA-6474-Switch-to-getDataPathElements()-in-UimaContext
     add 3679a12c8 [UIMA-6474] Switch to getDataPathElements() in UimaContext
     add 726f65858 Merge pull request #216 from apache/feature/UIMA-6474-Switch-to-getDataPathElements()-in-UimaContext
     add 4100c3666 [UIMA-6481] Enable issue management in GitHub repos
     add a79b9abdb Merge pull request #221 from apache/refactoring/UIMA-6481-Enable-issue-management-in-GitHub-repos
     add 67c8a3941 Issue #225: Improve deployment in OSGi environments
     add 23a0d2fb4 Issue #226: Provide SPI interfaces to locate descriptors
     add 240635155 Issue #230: Remove version overrides in Maven plugin modules
     add 186479e55 Merge pull request #231 from apache/refactoring/230-Remove-version-overrides-in-Maven-plugin-modules
     add 86b5529eb Merge branch 'main' into feature/226-Provide-SPI-interfaces-to-locate-descriptors
     add cf514a935 Issue #226: Provide SPI interfaces to locate descriptors
     add 54f6ba60b Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
     add 25681a7a5 Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
     add dbb5cff73 Merge pull request #233 from apache/refactoring/UIMA-6454-Update-dependencies
     add 273f20ba7 Merge branch 'main' into feature/226-Provide-SPI-interfaces-to-locate-descriptors
     add 8e64399c2 Merge pull request #227 from apache/feature/226-Provide-SPI-interfaces-to-locate-descriptors
     add cecd0b3be Merge branch 'main' into feature/225-Improve-deployment-in-OSGi-environments
     add dd748b416 Issue #228 - Move the UimaDecompiler class
     add 61151eb94 Issue #228 - Move the UimaDecompiler class
     add ebd763c55 Merge branch 'main' into refactoring/228-Move-the-UimaDecompiler-class
     add c1fd0b5cf Merge branch 'main' into refactoring/228-Move-the-UimaDecompiler-class
     add 2f6692acb Merge pull request #229 from apache/refactoring/228-Move-the-UimaDecompiler-class
     add 3715961c5 Merge branch 'main' into feature/225-Improve-deployment-in-OSGi-environments
     add 120124c5b Issue #226: Provide SPI interfaces to locate descriptors
     add 7ede46368 Issue #226: Provide SPI interfaces to locate descriptors
     add 7b800e514 [UIMA-6481] Enable issue management in GitHub repos
     add e0b4cd575 Issue #226: Provide SPI interfaces to locate descriptors
     add 07d5d89d2 Issue #226: Provide SPI interfaces to locate descriptors
     add bb4812432 Merge pull request #237 from apache/feature/226-Provide-SPI-interfaces-to-locate-descriptors-and-JCas-classes
     add 28f207328 Merge branch 'main' into upmerge
     add b2143f66a Merge pull request #242 from apache/upmerge
     add 8b46c3b3d Merge branch 'main' into feature/225-Improve-deployment-in-OSGi-environments
     add eb8eb8bc0 Issue #225: Improve deployment in OSGi environments
     add 21a82abf7 Merge pull request #232 from apache/feature/225-Improve-deployment-in-OSGi-environments
     add 1c1b3bc66 Issue #225: Improve deployment in OSGi environments
     add 00ed6f058 Merge pull request #244 from apache/feature/225-Improve-deployment-in-OSGi-environments
     add f3b0e300c #245 - Utility method for loading type systems in SPI providers
     add 42f25d3e7 #245 - Utility method for loading type systems in SPI providers
     add 44074f416 #245 - Utility method for loading type systems in SPI providers
     add f697932ce #245 - Utility method for loading type systems in SPI providers
     add e0f660059 Merge pull request #246 from apache/feature/245-Utility-method-for-loading-type-systems-in-SPI-providers
     add 1571bdd6c Issue #226: Provide SPI interfaces to locate descriptors and JCas classes
     add 30c1cb9be Issue #247 - RelativePathResolver should consider TCCL
     add 27a8186f7 Merge pull request #248 from apache/feature/247-RelativePathResolver-should-consider-TCCL
     add 08c4a0188 Merge branch 'main' into feature/226-Provide-SPI-interfaces-to-locate-descriptors-and-JCas-classes
     add 647793d6c Issue #226: Provide SPI interfaces to locate descriptors and JCas classes
     add 7deca1ed5 Merge pull request #249 from apache/feature/226-Provide-SPI-interfaces-to-locate-descriptors-and-JCas-classes
     add 4de1bd981 Issue #225: Improve deployment in OSGi environments
     add bd05de376 Merge pull request #250 from apache/225-Improve-deployment-in-OSGi-environments
     add 2be73010c Issue #252: Potential failure to look up FsGenerator3 in OSGI-like contexts
     add c337dcb6b Merge pull request #253 from apache/bugfix/252-Potential-failure-to-look-up-FsGenerator3-in-OSGI-like-contexts
     add f963e6241 Merge branch 'main' into bugfix/255-File-handle-leak-accessing-performanceTuning.properties
     add e9ef409f3 Merge pull request #257 from apache/bugfix/255-File-handle-leak-accessing-performanceTuning.properties
     add 8a47e1720 Merge commit 'a43f366f653e5bcb8f243db4a8c11e583064b898' into upmerge
     add 3c0af532b Empty merge of branch 'maintenance/3.3.x' into upmerge after release
     add 945240bfb No issue. Adjust jira legacy module version.
     add a336b2d94 Merge pull request #263 from apache/upmerge
     add c98e9c4c4 #267 - UIMA Log4jLogger_impl not compatible with log4j 2.18.0+
     add 1a9ca7165 Merge pull request #269 from apache/bugfix/267-UIMA-Log4jLogger_impl-not-compatible-with-log4j-2.18.0
     add fafdb225d #270 - Update dependencies
     add e86c211ae Merge pull request #271 from apache/refactoring/270-Update-dependencies
     add 6b22ad2ca Issue #266: Unable to install UIMA 3.3.1 Eclipse Plugins in Eclipse 2022-09
     add f00a36080 #270 - Update dependencies
     add c1c89117b No issue: Remove Jira line from PR template - we do not use Jira anymore.
     add 57bc1bb8c Merge pull request #273 from apache/refactoring/270-Update-dependencies
     add 0739e217f Merge branch 'main' into bugfix/266-Unable-to-install-UIMA-3.3.1-Eclipse-Plugins-in-Eclipse-2022-09
     add 0a595133f Issue #275: Improved error message made it even more misleading
     add 7a56157f3 Merge branch 'main' into bugfix/275-Improved-error-message-made-it-even-more-misleading
     add 4a033e303 Merge pull request #276 from apache/bugfix/275-Improved-error-message-made-it-even-more-misleading
     add 5c845f6c8 Merge branch 'main' into bugfix/266-Unable-to-install-UIMA-3.3.1-Eclipse-Plugins-in-Eclipse-2022-09
     add e84fd942a Merge pull request #274 from apache/bugfix/266-Unable-to-install-UIMA-3.3.1-Eclipse-Plugins-in-Eclipse-2022-09
     add 2ff1a07e8 Merge branch 'main' into bugfix/272-select-on-FSArray-seems-broken

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |  66 ++-
 .github/PULL_REQUEST_TEMPLATE.md                   |   4 +-
 .gitignore                                         |   1 -
 PearPackagingMavenPlugin/pom.xml                   |   7 +-
 RELEASE_NOTES.md                                   |   1 +
 aggregate-uimaj-docbooks/pom.xml                   |   3 +-
 aggregate-uimaj-eclipse-plugins/pom.xml            |  10 +-
 aggregate-uimaj/pom.xml                            |   2 +-
 jVinci/.gitignore                                  |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 jVinci/pom.xml                                     |  64 ++-
 jcasgen-maven-plugin/pom.xml                       |   7 +-
 ...se-feature => marker-file-enabling-auto-staging |   0
 ...date-site => marker-file-enabling-tycho-release |   0
 .../test.dat => marker-file-identifying-parent-pom |   0
 pom.xml                                            |  68 ++-
 stage-relesase-artifacts.sh                        |  49 --
 .../pom.xml                                        |  17 +-
 .../src/docs/asciidoc/common_book_info.adoc        |   0
 .../src/docs/asciidoc/uv3.maven.adoc               |  90 +++
 .../src/docs/asciidoc/uv3.one-time-setup.adoc      |  77 +++
 .../src/docs/asciidoc/uv3.project_structure.adoc   |  52 ++
 .../src/docs/asciidoc/uv3.release.adoc             | 584 +++++++++++++++++++
 .../docs/asciidoc/version_3_maintainers_guide.adoc |  27 +-
 uima-doc-v3-users-guide/pom.xml                    |   4 +-
 .../annotation_predicates/annotation-relations.png | Bin 328700 -> 0 bytes
 .../src/docs/asciidoc/uv3.spi.adoc                 |  77 +++
 .../src/docs/asciidoc/version_3_users_guide.adoc   |   4 +-
 uima-docbook-overview-and-setup/pom.xml            |   2 +-
 uima-docbook-references/pom.xml                    |   2 +-
 uima-docbook-tools/pom.xml                         |   2 +-
 uima-docbook-tutorials-and-users-guides/pom.xml    |   2 +-
 uimaj-adapter-vinci/.gitignore                     |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-adapter-vinci/pom.xml                        |  32 +-
 uimaj-bootstrap/pom.xml                            |   2 +-
 uimaj-component-test-util/pom.xml                  |   2 +-
 uimaj-core/.gitignore                              |   1 +
 ...est.dat => marker-file-identifying-osgi-bundle} |   0
 uimaj-core/pom.xml                                 |  94 ++--
 .../src/main/java/org/apache/uima/UimaContext.java |  58 +-
 .../org/apache/uima/cas/CASRuntimeException.java   |   6 -
 .../org/apache/uima/cas/impl/FSClassRegistry.java  |  76 ++-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   |  34 +-
 .../org/apache/uima/impl/UimaContext_ImplBase.java |   9 +-
 .../apache/uima/internal/util/UIMAClassLoader.java |  15 +-
 .../resource/impl/RelativePathResolver_impl.java   |  19 +-
 .../FsIndexCollectionProvider.java}                |  11 +-
 .../StringMap.java => spi/JCasClassProvider.java}  |  13 +-
 .../TypePrioritiesProvider.java}                   |  13 +-
 .../TypeSystemDescriptionProvider.java}            |  11 +-
 .../java/org/apache/uima/util/TypeSystemUtil.java  |  61 ++
 .../apache/uima/util/impl/Log4jLogger_impl.java    |  19 +-
 .../apache/uima/UIMAException_Messages.properties  |   7 +-
 .../apache/uima/cas/impl/FSClassRegistryTest.java  |  16 +
 .../apache/uima/cas/impl/TypeSystemImplTest.java   |  99 ++++
 .../org/apache/uima/impl/UimaContext_implTest.java |  17 +-
 .../java/org/apache/uima/jcas/test/JCasTest.java   |  28 -
 .../java/org/apache/uima/jcas/test/generatedx.xml  | 621 +++++++++++----------
 .../uima/spi/JCasClassProviderForTesting.java}     |  17 +-
 .../test/Sentence.java => spi/SpiSentence.java}    |  26 +-
 .../{cas/test/Sentence.java => spi/SpiToken.java}  |  26 +-
 .../services/org.apache.uima.spi.JCasClassProvider |   1 +
 uimaj-cpe/.gitignore                               |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-cpe/pom.xml                                  |  28 +-
 uimaj-document-annotation/pom.xml                  |   2 +-
 uimaj-eclipse-feature-runtime/.gitignore           |   3 -
 uimaj-eclipse-feature-runtime/feature.properties   | 153 -----
 uimaj-eclipse-feature-runtime/feature.xml          | 162 ++++++
 .../marker-file-identifying-tycho-module           |   0
 uimaj-eclipse-feature-runtime/pom.xml              |  18 +-
 .../src/main/resources/feature.xml                 |  51 --
 uimaj-eclipse-feature-tools/.gitignore             |   3 -
 uimaj-eclipse-feature-tools/feature.properties     | 156 ------
 uimaj-eclipse-feature-tools/feature.xml            | 232 ++++++++
 .../marker-file-identifying-tycho-module           |   0
 uimaj-eclipse-feature-tools/pom.xml                |  55 +-
 .../src/main/resources/feature.xml                 | 115 ----
 .../pom.xml                                        |  49 +-
 uimaj-eclipse-update-site/.gitignore               |   1 -
 .../{src/main/resources => }/category.xml          |   4 +-
 .../marker-file-identifying-tycho-module           |   0
 uimaj-eclipse-update-site/pom.xml                  | 324 ++---------
 uimaj-ep-cas-editor-ide/.gitignore                 |   1 +
 uimaj-ep-cas-editor-ide/pom.xml                    |   2 +-
 uimaj-ep-cas-editor/.gitignore                     |   1 +
 uimaj-ep-cas-editor/pom.xml                        |   2 +-
 uimaj-ep-configurator/.gitignore                   |   1 +
 uimaj-ep-configurator/pom.xml                      |   2 +-
 uimaj-ep-debug/.gitignore                          |   1 +
 uimaj-ep-debug/pom.xml                             |   2 +-
 uimaj-ep-jcasgen/.gitignore                        |   1 +
 uimaj-ep-jcasgen/pom.xml                           |   2 +-
 uimaj-ep-launcher/.gitignore                       |   1 +
 uimaj-ep-launcher/pom.xml                          |   2 +-
 uimaj-ep-pear-packager/.gitignore                  |   1 +
 uimaj-ep-pear-packager/pom.xml                     |   2 +-
 uimaj-ep-runtime/.gitignore                        |   1 +
 uimaj-ep-runtime/pom.xml                           |   7 +-
 uimaj-examples/pom.xml                             |   2 +-
 uimaj-json/pom.xml                                 |   2 +-
 uimaj-legacy-jira-report/pom.xml                   |   8 +-
 uimaj-parent/pom.xml                               |  80 +--
 uimaj-test-util/pom.xml                            |   2 +-
 uimaj-tools/.gitignore                             |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-tools/pom.xml                                | 171 +++---
 uimaj-v3migration-jcas/pom.xml                     |  23 +-
 .../apache/uima/migratev3/jcas/MigrateJCas.java    | 110 ++--
 .../uima/migratev3/jcas}/UimaDecompiler.java       |   2 +-
 111 files changed, 2680 insertions(+), 1665 deletions(-)
 rename uimaj-eclipse-feature-runtime/marker-file-identifying-eclipse-feature => jVinci/marker-file-identifying-osgi-bundle (100%)
 rename uimaj-eclipse-feature-tools/marker-file-identifying-eclipse-feature => marker-file-enabling-auto-staging (100%)
 rename uimaj-eclipse-update-site/marker-file-identifying-eclipse-update-site => marker-file-enabling-tycho-release (100%)
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => marker-file-identifying-parent-pom (100%)
 delete mode 100755 stage-relesase-artifacts.sh
 copy {uima-doc-v3-users-guide => uima-doc-v3-maintainers-guide}/pom.xml (88%)
 copy {uima-doc-v3-users-guide => uima-doc-v3-maintainers-guide}/src/docs/asciidoc/common_book_info.adoc (100%)
 create mode 100644 uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.maven.adoc
 create mode 100644 uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.one-time-setup.adoc
 create mode 100644 uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.project_structure.adoc
 create mode 100644 uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.release.adoc
 copy uima-doc-v3-users-guide/src/docs/asciidoc/version_3_users_guide.adoc => uima-doc-v3-maintainers-guide/src/docs/asciidoc/version_3_maintainers_guide.adoc (58%)
 delete mode 100644 uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations.png
 create mode 100644 uima-doc-v3-users-guide/src/docs/asciidoc/uv3.spi.adoc
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-adapter-vinci/marker-file-identifying-osgi-bundle (100%)
 copy uimaj-core/{src/test/resources/AnnotatorContextTest/testDir/test.dat => marker-file-identifying-osgi-bundle} (100%)
 copy uimaj-core/src/main/java/org/apache/uima/{cas/impl/FSRefIterator.java => spi/FsIndexCollectionProvider.java} (79%)
 copy uimaj-core/src/main/java/org/apache/uima/{cas/impl/StringMap.java => spi/JCasClassProvider.java} (82%)
 copy uimaj-core/src/main/java/org/apache/uima/{cas/impl/StringMap.java => spi/TypePrioritiesProvider.java} (80%)
 copy uimaj-core/src/main/java/org/apache/uima/{cas/impl/FSRefIterator.java => spi/TypeSystemDescriptionProvider.java} (78%)
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/TypeSystemImplTest.java
 copy uimaj-core/src/{main/java/org/apache/uima/cas/impl/FsGenerator3.java => test/java/org/apache/uima/spi/JCasClassProviderForTesting.java} (74%)
 copy uimaj-core/src/test/java/org/apache/uima/{cas/test/Sentence.java => spi/SpiSentence.java} (69%)
 copy uimaj-core/src/test/java/org/apache/uima/{cas/test/Sentence.java => spi/SpiToken.java} (70%)
 create mode 100644 uimaj-core/src/test/resources/META-INF/services/org.apache.uima.spi.JCasClassProvider
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-cpe/marker-file-identifying-osgi-bundle (100%)
 delete mode 100644 uimaj-eclipse-feature-runtime/.gitignore
 delete mode 100644 uimaj-eclipse-feature-runtime/feature.properties
 create mode 100644 uimaj-eclipse-feature-runtime/feature.xml
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-eclipse-feature-runtime/marker-file-identifying-tycho-module (100%)
 delete mode 100644 uimaj-eclipse-feature-runtime/src/main/resources/feature.xml
 delete mode 100644 uimaj-eclipse-feature-tools/.gitignore
 delete mode 100644 uimaj-eclipse-feature-tools/feature.properties
 create mode 100644 uimaj-eclipse-feature-tools/feature.xml
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-eclipse-feature-tools/marker-file-identifying-tycho-module (100%)
 delete mode 100644 uimaj-eclipse-feature-tools/src/main/resources/feature.xml
 copy {aggregate-uimaj-docbooks => uimaj-eclipse-maven-p2-site}/pom.xml (51%)
 delete mode 100644 uimaj-eclipse-update-site/.gitignore
 rename uimaj-eclipse-update-site/{src/main/resources => }/category.xml (82%)
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-eclipse-update-site/marker-file-identifying-tycho-module (100%)
 copy uimaj-core/src/test/resources/AnnotatorContextTest/testDir/test.dat => uimaj-tools/marker-file-identifying-osgi-bundle (100%)
 rename {uimaj-core/src/main/java/org/apache/uima/cas/impl => uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas}/UimaDecompiler.java (99%)