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 2020/04/09 15:25:42 UTC

[uima-uimafit] branch master updated (bfa3ccb -> 6fe975d)

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

rec pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.


    from bfa3ccb  Merge pull request #91 from apache/UIMA-6181-Fix-complaints-about-maven-plugin-plugin-in-Eclipse
     add 4c1f829  No issue. Update Eclipse metadata.
     add 0bc32b1  [UIMA-6147] Upgrade to Spring 4
     add 1f49570  Merge pull request #92 from apache/feature/UIMA-6147-Upgrade-to-Spring-4
     add 600dadc  Merge branch 'master-v2' into sync-master-v2-to-master
     add 3c01c83  [NO JIRA] Fix NOTICE file
     new 6fe975d  Merge pull request #94 from apache/sync-master-v2-to-master

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:
 NOTICE                                             |  2 +-
 src/main/dist-bin/LICENSE                          | 53 ++++++++++++----------
 src/main/dist-bin/NOTICE                           | 34 +++++++++-----
 .../.settings/org.eclipse.core.resources.prefs     |  1 -
 uimafit-parent/pom.xml                             |  2 +-
 5 files changed, 52 insertions(+), 40 deletions(-)


[uima-uimafit] 01/01: Merge pull request #94 from apache/sync-master-v2-to-master

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git

commit 6fe975d5c4c1e593b87b7aeddb83ba5d26418f47
Merge: bfa3ccb 3c01c83
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Apr 9 17:25:34 2020 +0200

    Merge pull request #94 from apache/sync-master-v2-to-master
    
    Sync master v2 to master

 NOTICE                                             |  2 +-
 src/main/dist-bin/LICENSE                          | 53 ++++++++++++----------
 src/main/dist-bin/NOTICE                           | 34 +++++++++-----
 .../.settings/org.eclipse.core.resources.prefs     |  1 -
 uimafit-parent/pom.xml                             |  2 +-
 5 files changed, 52 insertions(+), 40 deletions(-)