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:49 UTC

[uima-uimafit] branch bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes updated (ccb8d8b -> 4e2cd90)

This is an automated email from the ASF dual-hosted git repository.

rec pushed a change to branch bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.


    from ccb8d8b  [UIMA-6396] uimaFIT maven plugin mixes up test and compile scopes
     add e273553  [UIMA-6392] Better delegate key generation
     add e910935  Merge pull request #159 from apache/feature/UIMA-6392-Better-delegate-key-generation
     add c13c753  Merge branch 'main' into bugfix/UIMA-6384-parallelism-argument-in-CpePipeline-is-ignored
     add 9fb6719  Merge branch 'release/3.2.x' into tie-up-loose-branches
     add d17d017  Merge pull request #160 from apache/tie-up-loose-branches
     add deccbd9  Merge branch 'main' into bugfix/UIMA-6385-Potential-resource-key-clash-in-environments-with-multiple-classloaders
     add be396fc  Merge pull request #162 from apache/bugfix/UIMA-6385-Potential-resource-key-clash-in-environments-with-multiple-classloaders
     add 4e2cd90  Merge branch 'main' into bugfix/UIMA-6396-uimaFIT-maven-plugin-mixes-up-test-and-compile-scopes

No new revisions were added by this update.

Summary of changes:
 .../apache/uima/fit/factory/AggregateBuilder.java  | 24 ++----
 .../uima/fit/factory/AnalysisEngineFactory.java    | 91 ++++++++++++++++------
 .../uima/fit/factory/AggregateBuilderTest.java     |  6 +-
 .../fit/factory/AnalysisEngineFactoryTest.java     | 48 ++++++++++++
 .../java/org/apache/uima/fit/cpe/CpeBuilder.java   | 16 ++--
 .../java/org/apache/uima/fit/cpe/CpePipeline.java  | 51 +++++++++---
 6 files changed, 178 insertions(+), 58 deletions(-)