Skip to content

Conversation

@reckart
Copy link
Member

@reckart reckart commented Jun 25, 2020

Upmerge of fix for UIMA-6168 which includes:

[UIMA-6168] protect indexes fails when there were no indexed fs that needed protecting
[UIMA-6244] change the special chars to allowed ones in windows

reckart and others added 11 commits May 12, 2020 11:23
…XMl-special-chars-in-target-path

[UIMA-6225] Unable to install a pear package into a directory containing special character like <,> or &
- Comment out SNAPSHOT repos - these should only be enabled if we really need them, otherwise e.g. dependencies of the Eclipse plugins (which use version ranges) might resolve to SNAPSHOT versions
…cause the DocBook build process does not work with them...
…-from-repo

[NO JIRA] Exclude issues fixed folder from repo and fix Docbook build again
…needed protecting

- Restore dropping protection levels in the CAS when closing a FSsTobeAddedback context
…-were-no-indexed-fs-that-needed-protecting

* master: (2071 commits)
  Fix CVD makeNodes to used array length
  [UIMA-6244] change special xml chars to ones that are valid with windows
  UIMA-6199 add comment
  UIMA-6199 add comments describing meaning of length
  make forAllViews public so it can be accessed from another internl pkg
  UIMA-6199 2 part fix for edge case of non-indexed doc_annot
  [UIMA-6199] Unindexed document annotation added back to index during deserialization
  [UIMA-6199] Unindexed document annotation added back to index during deserialization
  [UIMA-6187] add apache license, gitignore issuesFixed
  [UIMA-6187] gitattributes: .sh files checked out with just LF
  [UIMA-6176] add .asf.yaml with description and homepage link
  [UIMA-6170] Ambiguous method call when compiling on Java 13
  [UIMA-6160] nonsense comment change only to try to retrigger test
  [UIMA-6160] fix typo in javadoc
  [UIMA-6160] fix javadoc comment, also in AnnotationFS
  [UIMA-6160] add startAt with one int, incl doc and test
  [UIMA-6168] add test case
  [UIMA-6168] fix array index refs, clarify use cases and logic
  make refs final inside lambda
  fix spelling of saved_begin, saved_end
  ...

# Conflicts:
#	uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
#	uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
#	uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
#	uimaj-parent/pom.xml
@reckart reckart added this to the 3.2.0 milestone Jun 25, 2020
@reckart reckart self-assigned this Jun 25, 2020
@reckart
Copy link
Member Author

reckart commented Jun 25, 2020

Jenkins, can you test this please?

@reckart reckart merged commit c00c06e into master Jun 25, 2020
@reckart reckart deleted the UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting branch June 25, 2020 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants