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 2020/06/19 11:42:19 UTC
[uima-uimaj] branch rc/uimaj-3.1.1 updated (e0e68cf -> ba5d6b5)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from e0e68cf [maven-release-plugin] prepare for next development iteration
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 4d8f006 no Jira - fix up gitIgnore fore cpe test data
add ddd62f6 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and support serializing using these.
add a62793d Merge pull request #28 from apache/enhancement/UIMA-6128-xml-1-1
add 1be1e13 [UIMA-6128] hook up xcas-1-1 to save
add 1b9998f Merge pull request #31 from apache/enhancement/UIMA-6128-hook-up-xcas-1-1
add 1b04bc7 [UIMA-6184] Move code quality profiles to parent POM
add b3137a0 Merge pull request #33 from apache/UIMA-6184-Move-code-quality-profiles-to-parent-POM
add 941a8ce [UIMA-6187] add eol=lf for .sh files
add b4d19f6 Merge pull request #34 from apache/UIMA-6187-v2
add fe73a79 [UIMA-6200] Constructing aggregate engines is slow
add 17711e0 [UIMA-6200] Constructing aggregate engines is slow
add 0784566 [UIMA-6200] Constructing aggregate engines is slow
add de8c8b8 [UIMA-6200] Constructing aggregate engines is slow
add a63872a Merge pull request #37 from apache/feature/UIMA-6200-Constructing-aggregate-engines-is-slow
add f40fd06 [UIMA-6225] Unable to install a pear package into a directory containing special character like <,> or &
add 7343e23 [UIMA-6141] add combine.self="override" back to <configuration> element
add 4e80a5f [UIMA-6146] remove <h1> from package.html, java 13 javadoc complains
add da6e065 [UIMA-6153] add test case for setting <Annotation> in select
add b196f27 [UIMA-5536] document in code the Jira this update did
add a9cec9c [UIMA-6153] improve docs for specifying generic types in select framework, fix some typos too
add 1fb3393 no jira - enable suport for tuning hash map
add 18cdb21 [UIMA-6162] synchronize some CAS serialization
add 382b096 [UIMA-6162] document some CAS serialization are synchronized
add e3cd982 [UIMA-6162] Concurrent binary serialization produces corrupt output
add 953d4d8 [UIMA-6162] Concurrent binary serialization produces corrupt output
add 4002169 Merge pull request #16 from apache/bugfix/UIMA-6162-Concurrent-binary-serialization-produces-corrupt-output
add 827f4f6 [UIMA-6152] "trim" method for AnnotationFS
add 8174a6b add protectIndexes, do only if begin or end changes, add check for null text
add 5c849c5 fix spelling of saved_begin, saved_end
add ced1e68 make refs final inside lambda
add 17f6dfd add testcase temp file to .gitignore
add 9d1ad83 [UIMA-6159] add method signatures for FeatureStructure
add 387b047 Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP
add 1e2a54a [UIMA-6168] fix array index refs, clarify use cases and logic
add c2029bd Merge pull request #20 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds
add 5cc8c7c [UIMA-6164] update several POMs for eclipse plugins so they build
add 3d943f3 [UIMA-6164] fix case-editor-ide, add missing provided-scope
add 1e3977d [UIMA-6164] add more excludes and insure scope provide is present for eclipse plugins
add 682dd57 add provided scopes
add 1ce3756 Merge pull request #19 from apache/UIMA-6164_update_eclipse_plugin_dependencies
add 97897ae [UIMA-6168] add test case
add fde9a6e Merge pull request #24 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds
add f5f2f30 Merge remote-tracking branch 'origin/master' into feature/UIMA-6152-trim-method-for-AnnotationFS
add 03b9cae Merge pull request #17 from apache/feature/UIMA-6152-trim-method-for-AnnotationFS
add c5ab3a7 [UIMA-6160] add startAt with one int, incl doc and test
add d773ef9 [UIMA-6160] fix javadoc comment, also in AnnotationFS
add 8cfb9cb [UIMA-6160] fix typo in javadoc
add 4f8130b [UIMA-6160] nonsense comment change only to try to retrigger test
add 91091c4 Merge pull request #25 from apache/feature/UIMA-6160-startAt-with-single-int-arg
add 440ed6b [UIMA-6170] Ambiguous method call when compiling on Java 13
add e1fbd54 Merge pull request #27 from apache/bugfix/UIMA-6170-Ambiguous-method-call-when-compiling-on-Java-13
add 04bb4c8 Merge branch 'master-v2' into master-merge-v2
add e1aa503 Merge pull request #26 from apache/master-merge-v2
add caae4c5 Merge branch 'master-v2' of https://github.com/apache/uima-uimaj into enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
add db60e5f Merge pull request #30 from apache/enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
add c463a9d [UIMA-6176] add .asf.yaml with description and homepage link
add fa44dad [UIMA-6187] gitattributes: .sh files checked out with just LF
add 81b6da1 [UIMA-6187] add apache license, gitignore issuesFixed
add aa11dfa Merge pull request #35 from apache/UIMA-6187-v3
add ab9731b [UIMA-6199] Unindexed document annotation added back to index during deserialization
add bc9f9dd [UIMA-6199] Unindexed document annotation added back to index during deserialization
add 3120d94 UIMA-6199 2 part fix for edge case of non-indexed doc_annot
add 5e7a391 make forAllViews public so it can be accessed from another internl pkg
add 549ac4d UIMA-6199 add comments describing meaning of length
add 9c2f4ff UIMA-6199 add comment
add 332769e Merge pull request #36 from apache/UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization
add 86cb158 Merge branch 'master-v2' into sync-master-v2-to-master
add 7753709 Merge pull request #38 from apache/sync-master-v2-to-master
add 50a9d81 [UIMA-6225] Preparing to merge feature branch into master (v3)
add 0211057 Merge pull request #41 from apache/UIMA-6225-PEAR-install-fails-with-XMl-special-chars-in-target-path
add 702abf1 [UIMA-6244] change special xml chars to ones that are valid with windows
add ba5d6b5 Merge branch 'master' into rc/uimaj-3.1.1
No new revisions were added by this update.
Summary of changes:
src/main/scripts/runAE.sh => .asf.yaml | 15 +-
.gitattributes | 12 +
.gitignore | 3 +
uima-docbook-references/src/docbook/ref.pear.xml | 25 +-
.../src/docbook/ref.xml.component_descriptor.xml | 2 +-
.../src/docbook/tug.application.xml | 6 +-
.../src/docbook/uv3.select.xml | 79 +-
uimaj-core/pom.xml | 17 +-
.../impl/PearAnalysisEngineWrapper.java | 13 +
.../main/java/org/apache/uima/cas/SelectFSs.java | 116 ++-
.../java/org/apache/uima/cas/SerialFormat.java | 11 +
.../org/apache/uima/cas/impl/BinaryCasSerDes.java | 26 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 283 ++---
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 277 ++---
.../java/org/apache/uima/cas/impl/CASImpl.java | 64 +-
.../org/apache/uima/cas/impl/CASSerializer.java | 628 +++++------
.../org/apache/uima/cas/impl/FSsTobeAddedback.java | 2 +-
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 74 +-
.../org/apache/uima/cas/impl/XCASSerializer.java | 27 +-
.../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +-
.../java/org/apache/uima/cas/impl/package.html | 10 +-
.../src/main/java/org/apache/uima/cas/package.html | 10 +-
.../org/apache/uima/cas/text/AnnotationFS.java | 23 +-
.../impl/CapabilityLanguageFlowController.java | 35 +-
.../apache/uima/flow/impl/FixedFlowController.java | 119 ++-
.../main/java/org/apache/uima/impl/package.html | 2 +-
.../uima/internal/util/Common_hash_support.java | 23 +-
.../java/org/apache/uima/jcas/tcas/Annotation.java | 45 +
.../src/main/java/org/apache/uima/package.html | 2 +-
.../java/org/apache/uima/pear/util/XMLUtil.java | 144 ++-
.../org/apache/uima/resource/PearSpecifier.java | 53 +-
.../uima/resource/impl/PearSpecifier_impl.java | 32 +-
.../org/apache/uima/util/CasCreationUtils.java | 12 +
.../main/java/org/apache/uima/util/CasIOUtils.java | 1090 ++++++++++----------
.../uima/flow/CapabilityLanguageFlowController.xml | 56 +-
.../org/apache/uima/flow/FixedFlowController.xml | 10 +-
.../src/main/resources/resourceSpecifierSchema.xsd | 7 +
.../impl/PearAnalysisEngineWrapperTest.java | 313 +++---
.../impl/ConcurrentBinarySerializationTest.java | 127 +++
.../org/apache/uima/cas/impl/ProtectIndexTest.java | 119 ++-
.../apache/uima/cas/impl/SelectFsTestNoJCas.java | 66 ++
.../apache/uima/cas/impl/XmiCasSerializerTest.java | 8 +-
.../uima/cas/test/AnnotationIteratorTest.java | 19 +-
.../uima/cas/test/SerializationReinitTest.java | 24 +
.../impl/CapabilityLanguageFlowControllerTest.java | 62 ++
.../uima/flow/impl/FixedFlowControllerTest.java | 56 +-
.../org/apache/uima/jcas/tcas/AnnotationTest.java | 205 ++++
.../util/TestPearInstallationVerification.java | 133 +--
.../uima/resource/impl/PearSpecifier_implTest.java | 51 +-
.../uima/util/CasIOUtilsAlwaysHoldOnTest.java | 80 ++
.../java/org/apache/uima/util/CasIOUtilsTest.java | 54 +-
.../apache/uima/util/impl/XMLParser_implTest.java | 19 +-
.../CapabilityLanguageFlowController.xml | 0
...l => testTypeSystem_token_sentence_no_jcas.xml} | 68 +-
.../FixedFlowController.xml | 0
.../resources/XmlParserTest/TestPearSpecifier.xml | 58 +-
uimaj-cpe/.gitignore | 3 +
uimaj-ep-cas-editor-ide/pom.xml | 150 ++-
uimaj-ep-cas-editor/pom.xml | 127 ++-
uimaj-ep-configurator/pom.xml | 161 ++-
uimaj-ep-debug/pom.xml | 19 +-
uimaj-ep-jcasgen/pom.xml | 58 +-
uimaj-ep-launcher/pom.xml | 80 +-
uimaj-ep-pear-packager/pom.xml | 91 +-
uimaj-parent/pom.xml | 1001 +++++++++---------
.../org/apache/uima/tools/jcasgen/package.html | 15 +-
.../apache/uima/migratev3/jcas/MigrateJCas.java | 4 +-
67 files changed, 4232 insertions(+), 2351 deletions(-)
copy src/main/scripts/runAE.sh => .asf.yaml (76%)
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/ConcurrentBinarySerializationTest.java
copy unused-saved/src/org/apache/uima/jcas/impl/JCasCoverClassFactoryTest.java => uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java (50%)
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/flow/impl/CapabilityLanguageFlowControllerTest.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/jcas/tcas/AnnotationTest.java
create mode 100644 uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsAlwaysHoldOnTest.java
copy uimaj-core/src/{main/resources/org/apache/uima/flow => test/resources/CapabilityLanguageFlowControllerTest}/CapabilityLanguageFlowController.xml (100%)
copy uimaj-core/src/test/resources/ExampleCas/{testTypeSystem_token_sentence_no_features.xml => testTypeSystem_token_sentence_no_jcas.xml} (92%)
copy uimaj-core/src/{main/resources/org/apache/uima/flow => test/resources/FixedFlowControllerTest}/FixedFlowController.xml (100%)
create mode 100644 uimaj-cpe/.gitignore