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/07/28 13:24:18 UTC
[uima-uimaj] branch refactoring/UIMA-6454-Update-dependencies created (now 54f6ba60b)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch refactoring/UIMA-6454-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
at 54f6ba60b Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
This branch includes the following new commits:
new 54f6ba60b Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
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.
[uima-uimaj] 01/01: Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/UIMA-6454-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 54f6ba60b037a5b660bcf525270122b2dba4725f
Merge: 3f97c9fea a79b9abdb
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Jul 28 15:24:05 2022 +0200
Merge branch 'main' into refactoring/UIMA-6454-Update-dependencies
* main: (52 commits)
[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
[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-6436] Move maintainer documentation from website into maintainer guide
[UIMA-6436] Move maintainer documentation from website into maintainer guide
...
% Conflicts:
% uimaj-parent/pom.xml
.asf.yaml | 66 ++-
PearPackagingMavenPlugin/pom.xml | 2 +-
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 | 2 +-
...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 | 2 +-
.../src/main/java/org/apache/uima/UimaContext.java | 58 +-
.../org/apache/uima/impl/UimaContext_ImplBase.java | 9 +-
.../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 | 62 +--
uimaj-test-util/pom.xml | 2 +-
uimaj-tools/pom.xml | 2 +-
uimaj-v3migration-jcas/pom.xml | 2 +-
67 files changed, 1609 insertions(+), 1015 deletions(-)