[uima-uimaj] branch feature/225-Improve-deployment-in-OSGi-environments updated (3715961c5 -> 8b46c3b3d)

[re...@apache.org]

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

rec pushed a change to branch feature/225-Improve-deployment-in-OSGi-environments
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


    from 3715961c5 Merge branch 'main' into feature/225-Improve-deployment-in-OSGi-environments
     add 6db34ef23 [#222] Support comparing test files irrespective of line endings
     add 7caca2c19 Merge branch 'maintenance/3.3.x' into feature/222-Support-comparing-test-files-irrespective-of-line-endings
     add 4e0aaa77a Merge pull request #223 from apache/feature/222-Support-comparing-test-files-irrespective-of-line-endings
     add 776543ef0 Merge pull request #224 from apache/refactoring/UIMA-6454-Update-dependencies
     add b7225a49c Issue #240: Helper annotation created by SelectFS should not survive
     add b5edf4349 Issue #238 - Form 6 serializes non-reachable FSes but should not
     add 1384ee2dc #238 - Form 6 serializes non-reachable FSes but should not
     add 6baa0c1fe Merge pull request #239 from apache/bugfix/238-Form-6-serializes-non-reachable-FSes-but-should-not
     add 819c18dfd Merge branch 'maintenance/3.3.x' into bugfix/240-Helper-annotation-created-by-SelectFS-should-not-survive
     add 39531d43e Merge pull request #241 from apache/bugfix/240-Helper-annotation-created-by-SelectFS-should-not-survive
     add 2f6316ecd Issue #235: Misleading error message when JCas type is not registered
     add 84b867261 Issue #235: Misleading error message when JCas type is not registered
     add 46b15032e [No issue] Auto-formatting
     add e0633297d Merge pull request #236 from apache/bugfix/235-Misleading-error-message-when-JCas-type-is-not-registered
     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

No new revisions were added by this update.

Summary of changes:
 .github/PULL_REQUEST_TEMPLATE.md                   |   2 +-
 .gitignore                                         |   1 -
 .../src/docs/asciidoc/uv3.spi.adoc                 |  52 ++
 .../src/docs/asciidoc/version_3_users_guide.adoc   |   2 +
 uimaj-core/pom.xml                                 |   5 +-
 .../org/apache/uima/cas/CASRuntimeException.java   |   7 +
 .../org/apache/uima/cas/impl/BinaryCasSerDes6.java |   2 +-
 .../java/org/apache/uima/cas/impl/CASImpl.java     |  13 +-
 .../org/apache/uima/cas/impl/FSClassRegistry.java  |  53 +-
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |   5 +-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   |   2 +-
 .../java/org/apache/uima/pear/util/FileUtil.java   |  10 +-
 ...oritiesProvider.java => JCasClassProvider.java} |   6 +-
 .../apache/uima/UIMAException_Messages.properties  |   1 +
 .../apache/uima/cas/impl/FSClassRegistryTest.java  |  16 +
 .../apache/uima/cas/impl/SelectFsNoJCasTest.java   |  27 +-
 .../org/apache/uima/cas/impl/SerDesForm6Test.java  |  10 -
 .../uima/cas/serdes/SerDesCasIOTestUtils.java      |  25 +
 .../cas/serdes/scenario/DesSerTestScenario.java    |   6 +
 .../java/org/apache/uima/jcas/test/JCasTest.java   |  36 +-
 .../java/org/apache/uima/jcas/test/generatedx.xml  | 621 +++++++++++----------
 .../util/PearInstallationVerificationTest.java     |  13 +-
 .../uima/spi/JCasClassProviderForTesting.java}     |  12 +-
 .../test/Sentence.java => spi/SpiSentence.java}    |  26 +-
 .../{cas/test/Sentence.java => spi/SpiToken.java}  |  26 +-
 .../java/org/apache/uima/util/CasIOUtilsTest.java  |  40 ++
 .../services/org.apache.uima.spi.JCasClassProvider |   1 +
 uimaj-ep-cas-editor-ide/.gitignore                 |   1 +
 uimaj-ep-cas-editor/.gitignore                     |   1 +
 uimaj-ep-configurator/.gitignore                   |   1 +
 uimaj-ep-debug/.gitignore                          |   1 +
 uimaj-ep-jcasgen/.gitignore                        |   1 +
 uimaj-ep-launcher/.gitignore                       |   1 +
 uimaj-ep-pear-packager/.gitignore                  |   1 +
 uimaj-ep-runtime/.gitignore                        |   1 +
 35 files changed, 631 insertions(+), 397 deletions(-)
 create mode 100644 uima-doc-v3-users-guide/src/docs/asciidoc/uv3.spi.adoc
 copy uimaj-core/src/main/java/org/apache/uima/spi/{TypePrioritiesProvider.java => JCasClassProvider.java} (85%)
 copy uimaj-core/src/{main/java/org/apache/uima/spi/TypeSystemDescriptionProvider.java => test/java/org/apache/uima/spi/JCasClassProviderForTesting.java} (75%)
 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