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 2021/11/26 13:04:44 UTC
[uima-uimafit] branch release/3.2.x updated (fd33fbf -> 1b02407)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch release/3.2.x
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
from fd33fbf Merge pull request #161 from apache/bugfix/UIMA-6385-Potential-resource-key-clash-in-environments-with-multiple-classloaders
add eae6dd0 Merge pull request #157 from apache/bugfix/UIMA-6384-parallelism-argument-in-CpePipeline-is-ignored
add 3ba4c19 [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
add 19454b3 [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
add 068e093 [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
add f26cbd4 [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
add 445ace3 Merge branch 'release/3.2.x' into bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
add ccb8d8b [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
new 1b02407 Merge pull request #164 from apache/bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
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.
Summary of changes:
.../fit/factory/TypeSystemDescriptionFactory.java | 1 +
.../uima/fit/internal/ResourceManagerFactory.java | 8 ++
uimafit-maven-plugin/pom.xml | 4 +-
.../it/compile-test-scope/compile-artifact/pom.xml | 32 +++++++
.../META-INF/org.apache.uima.fit/types.txt | 1 +
.../apache/uima/fit/type/compileartifact/types.xml | 4 +-
.../main-artifact-plus-test-scope/pom.xml | 79 ++++++++++++++++
.../src/main/java/TestAnnotator.java | 9 +-
.../it/compile-test-scope/main-artifact/pom.xml | 78 ++++++++++++++++
.../main-artifact/src/main/java/TestAnnotator.java | 9 +-
.../src/it/compile-test-scope/pom.xml | 43 +++++++++
.../TestAnnotator.xml | 100 +++++++++++++++++++++
.../reference/main-artifact/TestAnnotator.xml | 80 +++++++++++++++++
.../it/compile-test-scope/test-artifact/pom.xml | 40 +++++++++
.../META-INF/org.apache.uima.fit/types.txt | 1 +
.../apache/uima/fit/type/testartifact/types.xml | 13 +--
.../it/compile-test-scope/test-artifact2/pom.xml | 32 +++++++
.../META-INF/org.apache.uima.fit/types.txt | 1 +
.../apache/uima/fit/type/testartifact2/types.xml | 4 +-
.../src/it/compile-test-scope/verify.bsh | 73 +++++++++++++++
.../org/apache/uima/fit/maven/EnhanceMojo.java | 50 ++++++-----
.../uima/fit/maven/GenerateDescriptorsMojo.java | 25 ++++--
.../java/org/apache/uima/fit/maven/util/Util.java | 20 ++++-
23 files changed, 655 insertions(+), 52 deletions(-)
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/compile-artifact/pom.xml
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/compile-artifact/src/main/resources/META-INF/org.apache.uima.fit/types.txt
copy uimafit-benchmark/src/main/resources/org/apache/uima/fit/type/Sentence.xml => uimafit-maven-plugin/src/it/compile-test-scope/compile-artifact/src/main/resources/org/apache/uima/fit/type/compileartifact/types.xml (92%)
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/main-artifact-plus-test-scope/pom.xml
copy uimafit-core/src/test/java/DefaultPackageAE.java => uimafit-maven-plugin/src/it/compile-test-scope/main-artifact-plus-test-scope/src/main/java/TestAnnotator.java (81%)
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/main-artifact/pom.xml
copy uimafit-core/src/test/java/DefaultPackageAE.java => uimafit-maven-plugin/src/it/compile-test-scope/main-artifact/src/main/java/TestAnnotator.java (81%)
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/pom.xml
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/reference/main-artifact-plus-test-scope/TestAnnotator.xml
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/reference/main-artifact/TestAnnotator.xml
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/test-artifact/pom.xml
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/test-artifact/src/main/resources/META-INF/org.apache.uima.fit/types.txt
copy uimafit-benchmark/src/main/resources/org/apache/uima/fit/type/Sentence.xml => uimafit-maven-plugin/src/it/compile-test-scope/test-artifact/src/main/resources/org/apache/uima/fit/type/testartifact/types.xml (82%)
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/test-artifact2/pom.xml
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/test-artifact2/src/main/resources/META-INF/org.apache.uima.fit/types.txt
copy uimafit-benchmark/src/main/resources/org/apache/uima/fit/type/Sentence.xml => uimafit-maven-plugin/src/it/compile-test-scope/test-artifact2/src/main/resources/org/apache/uima/fit/type/testartifact2/types.xml (93%)
create mode 100644 uimafit-maven-plugin/src/it/compile-test-scope/verify.bsh
[uima-uimafit] 01/01: Merge pull request #164 from apache/bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch release/3.2.x
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 1b02407043bebcd34e5836f28bd76d38864f778c
Merge: fd33fbf ccb8d8b
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Fri Nov 26 12:15:06 2021 +0100
Merge pull request #164 from apache/bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
.../fit/factory/TypeSystemDescriptionFactory.java | 1 +
.../uima/fit/internal/ResourceManagerFactory.java | 8 ++
uimafit-maven-plugin/pom.xml | 4 +-
.../it/compile-test-scope/compile-artifact/pom.xml | 32 +++++++
.../META-INF/org.apache.uima.fit/types.txt | 1 +
.../apache/uima/fit/type/compileartifact/types.xml | 32 +++++++
.../main-artifact-plus-test-scope/pom.xml | 79 ++++++++++++++++
.../src/main/java/TestAnnotator.java | 33 +++++++
.../it/compile-test-scope/main-artifact/pom.xml | 78 ++++++++++++++++
.../main-artifact/src/main/java/TestAnnotator.java | 33 +++++++
.../src/it/compile-test-scope/pom.xml | 43 +++++++++
.../TestAnnotator.xml | 100 +++++++++++++++++++++
.../reference/main-artifact/TestAnnotator.xml | 80 +++++++++++++++++
.../it/compile-test-scope/test-artifact/pom.xml | 40 +++++++++
.../META-INF/org.apache.uima.fit/types.txt | 1 +
.../apache/uima/fit/type/testartifact/types.xml | 35 ++++++++
.../it/compile-test-scope/test-artifact2/pom.xml | 32 +++++++
.../META-INF/org.apache.uima.fit/types.txt | 1 +
.../apache/uima/fit/type/testartifact2/types.xml | 32 +++++++
.../src/it/compile-test-scope/verify.bsh | 73 +++++++++++++++
.../org/apache/uima/fit/maven/EnhanceMojo.java | 50 ++++++-----
.../uima/fit/maven/GenerateDescriptorsMojo.java | 25 ++++--
.../java/org/apache/uima/fit/maven/util/Util.java | 20 ++++-
23 files changed, 798 insertions(+), 35 deletions(-)