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/05/20 07:31:42 UTC
[uima-ruta] 01/01: Merge branch 'main' into no-jira/merge-3.1.x-into-main
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch no-jira/merge-3.1.x-into-main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 073333d6a7556c1f38a6718a15114a8f2ee10c51
Merge: 72c6b017 f05cec70
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Fri May 20 09:26:20 2022 +0200
Merge branch 'main' into no-jira/merge-3.1.x-into-main
* main:
[UIMA-6438] Add asf.yaml files to UIMA repos
[UIMA-6443] Fresh Eclipse update site for every release
[UIMA-6458] Spurious "parsedVersion.osgiVersion" in file names in target
[UIMA-6447] Update dependencies (Ruta 3.2.0)
[UIMA-6447] Update dependencies (Ruta 3.2.0)
[UIMA-6447] Update dependencies (Ruta 3.2.0)
[UIMA-6447] Update dependencies (Ruta 3.2.0)
[UIMA-6426] Upgrade to UIMA Java SDK 3.3.0
[UIMA-6433] Update issue and PR templates
[NO-JIRA] Set version to 3.2.0-SNAPSHOT
.asf.yaml | 22 +-
.github/ISSUE_TEMPLATE/bug_report.md | 27 ++
.github/ISSUE_TEMPLATE/config.yml | 8 +
.github/ISSUE_TEMPLATE/feature_request.md | 16 ++
.github/ISSUE_TEMPLATE/refactoring.md | 10 +
.github/PULL_REQUEST_TEMPLATE.md | 17 ++
.../ruta-ep-example-extensions/pom.xml | 4 +-
example-projects/ruta-maven-example/pom.xml | 2 +-
...se-feature => marker-file-enabling-auto-staging | 0
...date-site => marker-file-identifying-parent-pom | 0
pom.xml | 93 +++----
ruta-basic-type/pom.xml | 2 +-
ruta-core-ext/pom.xml | 2 +-
ruta-core/pom.xml | 12 +-
.../main/java/org/apache/uima/ruta/RutaStream.java | 2 +-
.../org/apache/uima/ruta/action/GatherAction.java | 2 +-
.../org/apache/uima/ruta/action/MergeAction.java | 2 +-
.../uima/ruta/condition/ImplicitCondition.java | 2 +-
ruta-docbook/pom.xml | 2 +-
ruta-eclipse-feature/.gitignore | 1 -
ruta-eclipse-feature/feature.properties | 145 -----------
ruta-eclipse-feature/feature.xml | 205 +++++++++++++++
...eature => marker-file-identifying-tycho-module} | 0
ruta-eclipse-feature/pom.xml | 102 +++-----
.../src/main/resources/feature.xml | 97 -------
ruta-eclipse-update-site/category.xml | 2 +-
.../marker-file-identifying-tycho-module | 0
ruta-eclipse-update-site/pom.xml | 290 ++++-----------------
.../src/main/resources/category.xml | 31 ---
ruta-ep-addons/pom.xml | 4 +-
ruta-ep-caseditor/pom.xml | 4 +-
ruta-ep-core-ext/pom.xml | 5 +-
ruta-ep-engine/pom.xml | 77 ++++--
ruta-ep-ide-ui/pom.xml | 4 +-
ruta-ep-ide/pom.xml | 4 +-
ruta-ep-parent/pom.xml | 2 +-
ruta-ep-textruler/pom.xml | 4 +-
ruta-maven-archetype/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 4 +-
ruta-maven-plugin/pom.xml | 2 +-
ruta-parent/pom.xml | 51 ++--
ruta-typesystem/pom.xml | 2 +-
42 files changed, 530 insertions(+), 733 deletions(-)