This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch UIMA-6330-uimaFIT-2.6.0-release
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
from 9c05c56 [maven-release-plugin] prepare for next development iteration
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 5f5c02b Merge pull request #163 from
apache/bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
add 0a226bb Merge branch 'main-v2' into UIMA-6330-uimaFIT-2.6.0-release
add cba4382 [No Jira] Ignore IntelliJ config folder
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
.../fit/factory/TypeSystemDescriptionFactory.java | 6 +-
.../uima/fit/internal/ResourceManagerFactory.java | 13 ++-
uimafit-maven-plugin/pom.xml | 2 +-
.../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/{default => 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 | 53 ++++++-----
.../uima/fit/maven/GenerateDescriptorsMojo.java | 25 ++++--
.../java/org/apache/uima/fit/maven/util/Util.java | 20 ++++-
24 files changed, 629 insertions(+), 90 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%)
copy uimafit-maven-plugin/src/it/{default => compile-test-scope}/pom.xml (63%)
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
