You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2020/06/20 16:45:20 UTC

[uima-uimaj] branch master updated (d70e6a4 -> 46edd92)

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

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


    from d70e6a4  Merge pull request #48 from apache/UIMA-6245-cvd
     add 35ae2c8  [maven-release-plugin] prepare release uimaj-3.1.1
     add ed9cbc9  [maven-release-plugin] prepare for next development iteration
     add 8a34550  [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
     add 287618c  [maven-release-plugin] prepare for next development iteration
     add 1596339  [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1
     add 20dced7  put combine.self on target for test
     add 0920a82  move combine.self=override to config element
     add f9ad933  [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
     add 94a2201  [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1
     add 7bd43d3  [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
     add e0e68cf  [maven-release-plugin] prepare for next development iteration
     add ba5d6b5  Merge branch 'master' into rc/uimaj-3.1.1
     new 46edd92  Merge pull request #49 from apache/rc/uimaj-3.1.1

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:
 PearPackagingMavenPlugin/pom.xml                | 2 +-
 aggregate-uimaj-docbooks/pom.xml                | 2 +-
 aggregate-uimaj-eclipse-plugins/pom.xml         | 2 +-
 aggregate-uimaj/pom.xml                         | 2 +-
 jVinci/pom.xml                                  | 2 +-
 jcasgen-maven-plugin/pom.xml                    | 2 +-
 pom.xml                                         | 2 +-
 uima-docbook-overview-and-setup/pom.xml         | 2 +-
 uima-docbook-references/pom.xml                 | 2 +-
 uima-docbook-tools/pom.xml                      | 2 +-
 uima-docbook-tutorials-and-users-guides/pom.xml | 2 +-
 uima-docbook-v3-users-guide/pom.xml             | 2 +-
 uimaj-adapter-soap/pom.xml                      | 2 +-
 uimaj-adapter-vinci/pom.xml                     | 2 +-
 uimaj-bootstrap/pom.xml                         | 2 +-
 uimaj-component-test-util/pom.xml               | 2 +-
 uimaj-core/pom.xml                              | 2 +-
 uimaj-cpe/pom.xml                               | 2 +-
 uimaj-document-annotation/pom.xml               | 2 +-
 uimaj-eclipse-feature-runtime/pom.xml           | 2 +-
 uimaj-eclipse-feature-tools/pom.xml             | 2 +-
 uimaj-eclipse-update-site/pom.xml               | 2 +-
 uimaj-ep-cas-editor-ide/pom.xml                 | 2 +-
 uimaj-ep-cas-editor/pom.xml                     | 2 +-
 uimaj-ep-configurator/pom.xml                   | 2 +-
 uimaj-ep-debug/pom.xml                          | 2 +-
 uimaj-ep-jcasgen/pom.xml                        | 2 +-
 uimaj-ep-launcher/pom.xml                       | 2 +-
 uimaj-ep-pear-packager/pom.xml                  | 2 +-
 uimaj-ep-runtime/pom.xml                        | 2 +-
 uimaj-examples/pom.xml                          | 2 +-
 uimaj-json/pom.xml                              | 2 +-
 uimaj-parent/pom.xml                            | 2 +-
 uimaj-test-util/pom.xml                         | 2 +-
 uimaj-tools/pom.xml                             | 2 +-
 uimaj-v3migration-jcas/pom.xml                  | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)


[uima-uimaj] 01/01: Merge pull request #49 from apache/rc/uimaj-3.1.1

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

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

commit 46edd9233d1a6854e189209a28a0119a6745c290
Merge: d70e6a4 ba5d6b5
Author: mischor <ms...@schor.com>
AuthorDate: Sat Jun 20 11:45:09 2020 -0500

    Merge pull request #49 from apache/rc/uimaj-3.1.1
    
    Merge UIMA 3.1.1 release branch

 PearPackagingMavenPlugin/pom.xml                | 2 +-
 aggregate-uimaj-docbooks/pom.xml                | 2 +-
 aggregate-uimaj-eclipse-plugins/pom.xml         | 2 +-
 aggregate-uimaj/pom.xml                         | 2 +-
 jVinci/pom.xml                                  | 2 +-
 jcasgen-maven-plugin/pom.xml                    | 2 +-
 pom.xml                                         | 2 +-
 uima-docbook-overview-and-setup/pom.xml         | 2 +-
 uima-docbook-references/pom.xml                 | 2 +-
 uima-docbook-tools/pom.xml                      | 2 +-
 uima-docbook-tutorials-and-users-guides/pom.xml | 2 +-
 uima-docbook-v3-users-guide/pom.xml             | 2 +-
 uimaj-adapter-soap/pom.xml                      | 2 +-
 uimaj-adapter-vinci/pom.xml                     | 2 +-
 uimaj-bootstrap/pom.xml                         | 2 +-
 uimaj-component-test-util/pom.xml               | 2 +-
 uimaj-core/pom.xml                              | 2 +-
 uimaj-cpe/pom.xml                               | 2 +-
 uimaj-document-annotation/pom.xml               | 2 +-
 uimaj-eclipse-feature-runtime/pom.xml           | 2 +-
 uimaj-eclipse-feature-tools/pom.xml             | 2 +-
 uimaj-eclipse-update-site/pom.xml               | 2 +-
 uimaj-ep-cas-editor-ide/pom.xml                 | 2 +-
 uimaj-ep-cas-editor/pom.xml                     | 2 +-
 uimaj-ep-configurator/pom.xml                   | 2 +-
 uimaj-ep-debug/pom.xml                          | 2 +-
 uimaj-ep-jcasgen/pom.xml                        | 2 +-
 uimaj-ep-launcher/pom.xml                       | 2 +-
 uimaj-ep-pear-packager/pom.xml                  | 2 +-
 uimaj-ep-runtime/pom.xml                        | 2 +-
 uimaj-examples/pom.xml                          | 2 +-
 uimaj-json/pom.xml                              | 2 +-
 uimaj-parent/pom.xml                            | 2 +-
 uimaj-test-util/pom.xml                         | 2 +-
 uimaj-tools/pom.xml                             | 2 +-
 uimaj-v3migration-jcas/pom.xml                  | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)