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 2023/01/25 07:00:53 UTC

[uima-uimaj] 02/03: Merge branch 'main' into release/288-Apache-UIMA-3.4.0

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

rec pushed a commit to branch release/288-Apache-UIMA-3.4.0
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit cac4ddb11dc88baf638b6523bc89419193d8fd06
Merge: 49cb1fe3c 7fc066292
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Jan 25 07:57:21 2023 +0100

    Merge branch 'main' into release/288-Apache-UIMA-3.4.0
    
    * main:
      No issue: Protect main again (actually main-v2)
      No issue: Temporarily unprotect main so I can update the last commit metadata using a force push...
      Issue #292: Make CAS serialization tests more robust
      Issue #272: select on FSArray seems broken
      Issue #270: Update dependencies (3.4.0)

 .asf.yaml                                          |  2 -
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |  2 +-
 .../CasSerializationDeserialization_XCAS_Test.java |  4 ++
 .../uima/cas/serdes/SerDesCasIOTestUtils.java      |  2 +-
 .../cas/serdes/scenario/SerRefTestScenario.java    | 53 +++++++++++++++++-----
 uimaj-parent/pom.xml                               |  2 +-
 6 files changed, 48 insertions(+), 17 deletions(-)