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/01/24 08:44:47 UTC
[uima-uimafit] 01/01: Merge pull request #165 from apache/bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 2a9a37f6153d67048f6b308193d24d3aa0039347
Merge: be396fc 4e2cd90
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Jan 24 09:44:01 2022 +0100
Merge pull request #165 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(-)