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 2022/08/15 13:08:21 UTC
[uima-uimaj] branch upmerge updated (e0633297d -> 28f207328)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch upmerge
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
from e0633297d Merge pull request #236 from apache/bugfix/235-Misleading-error-message-when-JCas-type-is-not-registered
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 dd748b416 Issue #228 - Move the UimaDecompiler class
add 61151eb94 Issue #228 - Move the UimaDecompiler class
add 54f6ba60b Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
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 25681a7a5 Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
add dbb5cff73 Merge pull request #233 from apache/refactoring/UIMA-6454-Update-dependencies
add ebd763c55 Merge branch 'main' into refactoring/228-Move-the-UimaDecompiler-class
add 23a0d2fb4 Issue #226: Provide SPI interfaces to locate descriptors
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 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 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 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
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 66 ++-
.github/PULL_REQUEST_TEMPLATE.md | 2 +-
.gitignore | 1 -
PearPackagingMavenPlugin/pom.xml | 3 +-
RELEASE_NOTES.md | 2 +-
aggregate-uimaj-docbooks/pom.xml | 3 +-
aggregate-uimaj-eclipse-plugins/pom.xml | 10 +-
aggregate-uimaj/pom.xml | 2 +-
jVinci/pom.xml | 2 +-
jcasgen-maven-plugin/pom.xml | 3 +-
...se-feature => marker-file-enabling-auto-staging | 0
...e-feature => marker-file-enabling-tycho-release | 0
...date-site => 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 | 52 ++
.../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/pom.xml | 2 +-
uimaj-bootstrap/pom.xml | 2 +-
uimaj-component-test-util/pom.xml | 2 +-
uimaj-core/pom.xml | 21 +-
.../src/main/java/org/apache/uima/UimaContext.java | 58 +-
.../org/apache/uima/cas/impl/FSClassRegistry.java | 53 +-
.../org/apache/uima/impl/UimaContext_ImplBase.java | 9 +-
.../FsIndexCollectionProvider.java} | 11 +-
.../StringMap.java => spi/JCasClassProvider.java} | 13 +-
.../TypePrioritiesProvider.java} | 13 +-
.../TypeSystemDescriptionProvider.java} | 11 +-
.../apache/uima/cas/impl/FSClassRegistryTest.java | 16 +
.../org/apache/uima/impl/UimaContext_implTest.java | 17 +-
.../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/pom.xml | 2 +-
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 | 163 ++++++
.../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 | 6 +-
uimaj-examples/pom.xml | 2 +-
uimaj-json/pom.xml | 2 +-
uimaj-parent/pom.xml | 63 +--
uimaj-test-util/pom.xml | 2 +-
uimaj-tools/pom.xml | 2 +-
uimaj-v3migration-jcas/pom.xml | 23 +-
.../apache/uima/migratev3/jcas/MigrateJCas.java | 110 ++--
.../uima/migratev3/jcas}/UimaDecompiler.java | 2 +-
91 files changed, 2142 insertions(+), 1468 deletions(-)
rename uimaj-eclipse-feature-runtime/marker-file-identifying-eclipse-feature => marker-file-enabling-auto-staging (100%)
rename uimaj-eclipse-feature-tools/marker-file-identifying-eclipse-feature => marker-file-enabling-tycho-release (100%)
rename uimaj-eclipse-update-site/marker-file-identifying-eclipse-update-site => 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/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%)
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
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%)
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%)