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/01/16 15:05:06 UTC

[uima-uimaj] branch master updated (e1fbd54 -> e1aa503)

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 e1fbd54  Merge pull request #27 from apache/bugfix/UIMA-6170-Ambiguous-method-call-when-compiling-on-Java-13
     add db95edc  [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support
     add ab93a37  [UIMA-6115] rename trunk to master-v2
     add 4dc8961  move master-v2 to branches
     add f6c43b7  [UIMA-6126] Add .gitignore file to trunk
     add ca2703c  [UIMA-6126] add gitattributes, and gitignore for 2 eclipse feature proj
     add 30ad3e3  [UIMA-6138] change scm in pom for git
     add 50f2079  [UIMA-6141] move combine.self to proper element
     add 409a346  Merge pull request #15 from apache/UIMA-6138-v2
     add 3edaf4c  [UIMA-6143] point scm dev connection to git repo top level
     add 2a4d663  [UIMA-6141] delete combine.self after close reading of the docs
     add 219cb69  [UIMA-6141] add combine.self="override" back to <configuration> element
     add 7eaaa25  [UIMA-6146] remove <h1> from package.html, java 13 javadoc complains
     add 34b85e4  [UIMA-6165] upgrade the eclipse pluging builds
     add 00ce623  Merge pull request #22 from apache/UIMA-6165-update-eclipse-plugin-dependencies
     add d47f085  [UIMA-6168] copy change from v3, add test
     add d194ac4  Merge pull request #23 from apache/bug/UIMA-6168-protect-indexes-v2
     add 7498fb9  Merge branch 'master-v2' into feature/UIMA-5936-PearSpecifier-should-be-able-to-store-every-parametertype-that-analysisEngines-support
     add 24dd9ce  [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support
     add 1b0e3f9  [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support
     add 023aeb3  [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support
     add a76d3b5  [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support
     add 096aa4e  Merge pull request #10 from matthkoch/trunk
     add 04bb4c8  Merge branch 'master-v2' into master-merge-v2
     new e1aa503  Merge pull request #26 from apache/master-merge-v2

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:
 uima-docbook-references/src/docbook/ref.pear.xml   |  25 +-
 .../src/docbook/ref.xml.component_descriptor.xml   |   2 +-
 .../impl/PearAnalysisEngineWrapper.java            |  13 +
 .../org/apache/uima/resource/PearSpecifier.java    |  53 +++-
 .../uima/resource/impl/PearSpecifier_impl.java     |  32 +--
 .../src/main/resources/resourceSpecifierSchema.xsd |   7 +
 .../impl/PearAnalysisEngineWrapperTest.java        | 313 +++++++++++----------
 .../uima/resource/impl/PearSpecifier_implTest.java |  51 ++--
 .../apache/uima/util/impl/XMLParser_implTest.java  |  19 +-
 .../resources/XmlParserTest/TestPearSpecifier.xml  |  58 ++--
 10 files changed, 347 insertions(+), 226 deletions(-)

[uima-uimaj] 01/01: Merge pull request #26 from apache/master-merge-v2

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 e1aa503cbe8dc918a476033705421c115b0ad4c5
Merge: e1fbd54 04bb4c8
Author: mischor <ms...@schor.com>
AuthorDate: Thu Jan 16 10:04:59 2020 -0500

    Merge pull request #26 from apache/master-merge-v2
    
    Master merge v2 - merges in UIMA-5936 Pear Parameter overrides from v2 -> master

 uima-docbook-references/src/docbook/ref.pear.xml   |  25 +-
 .../src/docbook/ref.xml.component_descriptor.xml   |   2 +-
 .../impl/PearAnalysisEngineWrapper.java            |  13 +
 .../org/apache/uima/resource/PearSpecifier.java    |  53 +++-
 .../uima/resource/impl/PearSpecifier_impl.java     |  32 +--
 .../src/main/resources/resourceSpecifierSchema.xsd |   7 +
 .../impl/PearAnalysisEngineWrapperTest.java        | 313 +++++++++++----------
 .../uima/resource/impl/PearSpecifier_implTest.java |  51 ++--
 .../apache/uima/util/impl/XMLParser_implTest.java  |  19 +-
 .../resources/XmlParserTest/TestPearSpecifier.xml  |  58 ++--
 10 files changed, 347 insertions(+), 226 deletions(-)