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 2022/08/15 14:13:59 UTC

[uima-uimaj] branch main updated (bb4812432 -> b2143f66a)

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

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


    from bb4812432 Merge pull request #237 from apache/feature/226-Provide-SPI-interfaces-to-locate-descriptors-and-JCas-classes
     add 6db34ef23 [#222] Support comparing test files irrespective of line endings
     add 7caca2c19 Merge branch 'maintenance/3.3.x' into feature/222-Support-comparing-test-files-irrespective-of-line-endings
     add 4e0aaa77a Merge pull request #223 from apache/feature/222-Support-comparing-test-files-irrespective-of-line-endings
     add 776543ef0 Merge pull request #224 from apache/refactoring/UIMA-6454-Update-dependencies
     add b7225a49c Issue #240: Helper annotation created by SelectFS should not survive
     add b5edf4349 Issue #238 - Form 6 serializes non-reachable FSes but should not
     add 1384ee2dc #238 - Form 6 serializes non-reachable FSes but should not
     add 6baa0c1fe Merge pull request #239 from apache/bugfix/238-Form-6-serializes-non-reachable-FSes-but-should-not
     add 819c18dfd Merge branch 'maintenance/3.3.x' into bugfix/240-Helper-annotation-created-by-SelectFS-should-not-survive
     add 39531d43e Merge pull request #241 from apache/bugfix/240-Helper-annotation-created-by-SelectFS-should-not-survive
     add 2f6316ecd Issue #235: Misleading error message when JCas type is not registered
     add 84b867261 Issue #235: Misleading error message when JCas type is not registered
     add 46b15032e [No issue] Auto-formatting
     add e0633297d Merge pull request #236 from apache/bugfix/235-Misleading-error-message-when-JCas-type-is-not-registered
     add 28f207328 Merge branch 'main' into upmerge
     new b2143f66a Merge pull request #242 from apache/upmerge

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:
 .../org/apache/uima/cas/CASRuntimeException.java   |  7 ++++
 .../org/apache/uima/cas/impl/BinaryCasSerDes6.java |  2 +-
 .../java/org/apache/uima/cas/impl/CASImpl.java     | 13 +++++--
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |  5 ++-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   |  2 +-
 .../java/org/apache/uima/pear/util/FileUtil.java   | 10 +++---
 .../apache/uima/UIMAException_Messages.properties  |  1 +
 .../apache/uima/cas/impl/SelectFsNoJCasTest.java   | 27 ++++++++++++---
 .../org/apache/uima/cas/impl/SerDesForm6Test.java  | 10 ------
 .../uima/cas/serdes/SerDesCasIOTestUtils.java      | 25 ++++++++++++++
 .../cas/serdes/scenario/DesSerTestScenario.java    |  6 ++++
 .../java/org/apache/uima/jcas/test/JCasTest.java   | 36 ++++++++++---------
 .../util/PearInstallationVerificationTest.java     | 13 +++----
 .../java/org/apache/uima/util/CasIOUtilsTest.java  | 40 ++++++++++++++++++++++
 14 files changed, 148 insertions(+), 49 deletions(-)

[uima-uimaj] 01/01: Merge pull request #242 from apache/upmerge

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

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

commit b2143f66ad2aaf6956635d80989c7363e5ca23bd
Merge: bb4812432 28f207328
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Aug 15 16:13:52 2022 +0200

    Merge pull request #242 from apache/upmerge
    
    Merge 3.3.x maintenence branch to main

 .../org/apache/uima/cas/CASRuntimeException.java   |  7 ++++
 .../org/apache/uima/cas/impl/BinaryCasSerDes6.java |  2 +-
 .../java/org/apache/uima/cas/impl/CASImpl.java     | 13 +++++--
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |  5 ++-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   |  2 +-
 .../java/org/apache/uima/pear/util/FileUtil.java   | 10 +++---
 .../apache/uima/UIMAException_Messages.properties  |  1 +
 .../apache/uima/cas/impl/SelectFsNoJCasTest.java   | 27 ++++++++++++---
 .../org/apache/uima/cas/impl/SerDesForm6Test.java  | 10 ------
 .../uima/cas/serdes/SerDesCasIOTestUtils.java      | 25 ++++++++++++++
 .../cas/serdes/scenario/DesSerTestScenario.java    |  6 ++++
 .../java/org/apache/uima/jcas/test/JCasTest.java   | 36 ++++++++++---------
 .../util/PearInstallationVerificationTest.java     | 13 +++----
 .../java/org/apache/uima/util/CasIOUtilsTest.java  | 40 ++++++++++++++++++++++
 14 files changed, 148 insertions(+), 49 deletions(-)