This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch bugfix/240-Helper-annotation-created-by-SelectFS-should-not-survive in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 5111a2c8554b009c1c9295801d7ced94d1fee56a Merge: 819c18dfd 2f6692acb Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Mon Aug 15 11:01:12 2022 +0200 Merge branch 'main' into bugfix/240-Helper-annotation-created-by-SelectFS-should-not-survive * main: (57 commits) Issue #228 - Move the UimaDecompiler class Issue #226: Provide SPI interfaces to locate descriptors Issue #228 - Move the UimaDecompiler class Issue #230: Remove version overrides in Maven plugin modules Issue #226: Provide SPI interfaces to locate descriptors [UIMA-6481] Enable issue management in GitHub repos [UIMA-6474] Switch to getDataPathElements() in UimaContext [UIMA-6474] Switch to getDataPathElements() in UimaContext [UIMA-6474] Switch to getDataPathElements() in UimaContext [No Jira] Remove outdated figure [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6459] Upgrade dependencies [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8 [UIMA-6462] Avoid deploy broken checksum files for p2content.xml and artifacts.xml in feature modules [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide ... .asf.yaml | 66 ++- 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 | 42 ++ .../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/version_3_users_guide.adoc | 2 +- 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 | 16 +- .../src/main/java/org/apache/uima/UimaContext.java | 58 +- .../org/apache/uima/impl/UimaContext_ImplBase.java | 9 +- .../apache/uima/spi/FsIndexCollectionProvider.java | 27 + .../apache/uima/spi/TypePrioritiesProvider.java | 27 + .../uima/spi/TypeSystemDescriptionProvider.java | 27 + .../org/apache/uima/impl/UimaContext_implTest.java | 17 +- 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 ++++++ ...eature => 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/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml | 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- 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 +- 72 files changed, 1765 insertions(+), 1090 deletions(-)
