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 2021/10/08 07:39:47 UTC

[uima-uimaj] branch feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS updated (40de817 -> f017b9a)

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

rec pushed a change to branch feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


    from 40de817  Merge branch 'feature/UIMA-6374-Create-CAS-de-serialization-test-suite' into feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS
     add 20f1496  [UIMA-6374] Create CAS (de)serialization test suite
     add e45e9c7  Merge pull request #107 from apache/feature/UIMA-6316-Stop-using-the-deprecated-Pack200-when-building-update-sites
     add 7be8787  [UIMA-6310] JCasClassLoaderTest sometimes fails
     add dd4571f  Merge pull request #108 from apache/bugfix/UIMA-6310-JCasClassLoaderTest-sometimes-fails
     add f1754f0  [UIMA-6328] UIMA Java SDK 2.11.0 release
     add 734ff87  [UIMA-6299] Ensure that SNAPSHOT repos are commented out in POMs
     add 7ea2e4c  [UIMA-6328] UIMA Java SDK 2.11.0 release
     add 734f636  [UIMA-6341] Try out p2-layout-resolver
     add 3b48168  Merge pull request #115 from apache/feature/UIMA-6341-Try-out-p2-layout-resolver
     add 9ef88b1  Merge branch 'main-v2' into UIMA-6328-UIMA-Java-SDK-2.11.0-release
     add c935308  UIMA-6349: japicmp post processing script fails with Java 16
     add 9f87202  Merge pull request #117 from apache/bugfix/UIMA-6349-japicmp-post-processing-script-fails-with-Java-16-v2
     add 62e1be6  Merge branch 'main-v2' into UIMA-6328-UIMA-Java-SDK-2.11.0-release
     add ec48150  [UIMA-6328] UIMA Java SDK 2.11.0 release
     add 4b787c4  [UIMA-6310] JCasClassLoaderTest sometimes fails
     add 49f2fa6  Merge pull request #123 from apache/origin/bugfix/UIMA-6310-JCasClassLoaderTest-sometimes-fails-v2
     add 47b6359  Merge branch 'main-v2' into UIMA-6328-UIMA-Java-SDK-2.11.0-release
     add d24e5e4  [UIMA-6328] UIMA Java SDK 2.11.0 release
     add 5988b3d  [maven-release-plugin] prepare release uimaj-2.11.0
     add 558bd4a  [maven-release-plugin] prepare for next development iteration
     add 1f6fcae  [maven-release-plugin] prepare release uimaj-2.11.0
     add 98822f7  [maven-release-plugin] prepare for next development iteration
     add 1c28f62  [UIMA-6328] UIMA Java SDK 2.11.0 release
     add 5d8855d  Merge pull request #111 from apache/UIMA-6328-UIMA-Java-SDK-2.11.0-release
     add f8823ef  [UIMA-6387] Update p2 repo URLs from http to https
     add f0cbe6f  Merge pull request #132 from apache/bugfix/UIMA-6377-Spurious-multipleReferencesAllowed-warning-when-serializing-empty-arrays
     add aea163b  Merge branch 'maintenance/3.2.x' into bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https
     add 314da3e  Merge pull request #146 from apache/bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https
     add 35203fe  Merge pull request #147 from apache/maintenance/3.2.x
     add f93d482  Merge branch 'main' into feature/UIMA-6374-Create-CAS-de-serialization-test-suite
     add 6a80640  Merge pull request #143 from apache/feature/UIMA-6374-Create-CAS-de-serialization-test-suite
     add ead5aec  [UIMA-6386] Wrong session set on ConfigurationManager in aggregates
     add c16388e  Merge branch 'maintenance/3.2.x' into bugfix/UIMA-6386-Wrong-session-set-on-ConfigurationManager-in-aggregates
     add 3b5d609  Merge branch 'main' into bugfix/UIMA-6386-Wrong-session-set-on-ConfigurationManager-in-aggregates
     add 889824f  Merge pull request #148 from apache/bugfix/UIMA-6386-Wrong-session-set-on-ConfigurationManager-in-aggregates
     add f017b9a  Merge branch 'main' into feature/UIMA-6266-Clean-JSON-Wire-Format-for-CAS

No new revisions were added by this update.

Summary of changes:
 api-change-report.html                             |   2 +-
 uimaj-core/pom.xml                                 |   1 +
 .../java/org/apache/uima/UimaContextAdmin.java     |   8 +-
 .../org/apache/uima/impl/RootUimaContext_impl.java |   2 +-
 .../apache/uima/resource/Resource_ImplBase.java    |   6 +-
 .../impl/ConfigurationManagerImplBase.java         |   4 +
 .../impl/AnalysisEngine_implTest.java              |  52 +++++++++-
 .../uima/analysis_engine/impl/TestAnnotator.java   |  41 ++++----
 .../TestProgramaticPseudoAggregateAnnotator.java   | 105 +++++++++++++++++++++
 uimaj-parent/pom.xml                               |   2 +-
 10 files changed, 184 insertions(+), 39 deletions(-)
 create mode 100644 uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestProgramaticPseudoAggregateAnnotator.java