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 <[email protected]>
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(-)

Reply via email to