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/03/08 16:01:25 UTC

[uima-uimafit] 01/01: Merge branch 'main-v2' into UIMA-6330-uimaFIT-2.6.0-release

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

rec pushed a commit to branch UIMA-6330-uimaFIT-2.6.0-release
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git

commit 357f9b56e1b8132983d65a0271707ce1535c1961
Merge: f2f95e5 00107ae
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Mar 8 17:01:23 2021 +0100

    Merge branch 'main-v2' into UIMA-6330-uimaFIT-2.6.0-release
    
    * main-v2:
      [UIMA-6333] Update Spring dependency
    
    % Conflicts:
    %	uimafit-parent/pom.xml

 src/main/dist-bin/LICENSE | 11 +++++++++--
 src/main/dist-bin/NOTICE  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)