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/20 16:57:20 UTC

[uima-uimaj] branch bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context created (now b5bf534cf)

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

rec pushed a change to branch bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


      at b5bf534cf Merge branch 'main' into bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context

This branch includes the following new commits:

     new b5bf534cf Merge branch 'main' into bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[uima-uimaj] 01/01: Merge branch 'main' into bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit b5bf534cffcfe969c68afacabda7703ea690f858
Merge: c2db1db19 b3fcf24b7
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Fri Jan 20 17:57:06 2023 +0100

    Merge branch 'main' into bugfix/285-NPE-while-deserializing-an-XMI-in-a-PEAR-context
    
    * main: (91 commits)
      Issue #283: Update issue report generation
      Issue #283: Update issue report generation
      [UIMA-6436] Move maintainer documentation from website into maintainer guide
      [UIMA-6436] Move maintainer documentation from website into maintainer guide
      [UIMA-6436] Move maintainer documentation from website into maintainer guide
      Issue #265: Unable to release without auto-staging
      Issue #267 - UIMA Log4jLogger_impl not compatible with log4j 2.18.0+
      Issue #268: UIMA components log and then re-throw exceptions which usually leads to errors being logged twice
      Issue #275: Improved error message made it even more misleading
      Issue #266: Unable to install UIMA 3.3.1 Eclipse Plugins in Eclipse 2022-09
      No issue: Remove Jira line from PR template - we do not use Jira anymore.
      #270 - Update dependencies
      #270 - Update dependencies
      #267 - UIMA Log4jLogger_impl not compatible with log4j 2.18.0+
      No issue. Adjust jira legacy module version.
      Issue #252: Potential failure to look up FsGenerator3 in OSGI-like contexts
      Issue #225: Improve deployment in OSGi environments
      Issue #226: Provide SPI interfaces to locate descriptors and JCas classes
      Issue #226: Provide SPI interfaces to locate descriptors and JCas classes
      Issue #247 - RelativePathResolver should consider TCCL
      ...

 .asf.yaml                                          |  66 ++-
 .github/PULL_REQUEST_TEMPLATE.md                   |   4 +-
 .gitignore                                         |   1 -
 PearPackagingMavenPlugin/pom.xml                   |   7 +-
 RELEASE_NOTES.md                                   |   1 +
 aggregate-uimaj-docbooks/pom.xml                   |   3 +-
 aggregate-uimaj-eclipse-plugins/pom.xml            |  10 +-
 aggregate-uimaj/pom.xml                            |   2 +-
 jVinci/.gitignore                                  |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 jVinci/pom.xml                                     |  64 ++-
 jcasgen-maven-plugin/pom.xml                       |   7 +-
 ...se-feature => marker-file-enabling-auto-staging |   0
 ...ate-site => marker-file-enabling-changes-report |   0
 ...e-feature => marker-file-enabling-tycho-release |   0
 pom.xml                                            | 113 +++-
 stage-relesase-artifacts.sh                        |  49 --
 .../pom.xml                                        |  17 +-
 .../src/docs/asciidoc/common_book_info.adoc        |  42 ++
 .../src/docs/asciidoc/uv3.maven.adoc               |  97 ++++
 .../src/docs/asciidoc/uv3.one-time-setup.adoc      |  80 +++
 .../src/docs/asciidoc/uv3.project_structure.adoc   |  52 ++
 .../src/docs/asciidoc/uv3.release.adoc             | 505 +++++++++++++++++
 .../docs/asciidoc/version_3_maintainers_guide.adoc |  27 +-
 uima-doc-v3-users-guide/pom.xml                    |   4 +-
 .../annotation_predicates/annotation-relations.png | Bin 328700 -> 0 bytes
 .../src/docs/asciidoc/uv3.spi.adoc                 |  77 +++
 .../src/docs/asciidoc/version_3_users_guide.adoc   |   4 +-
 uima-docbook-overview-and-setup/pom.xml            |   2 +-
 uima-docbook-references/pom.xml                    |   2 +-
 uima-docbook-tools/pom.xml                         |   2 +-
 uima-docbook-tutorials-and-users-guides/pom.xml    |   2 +-
 uimaj-adapter-vinci/.gitignore                     |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-adapter-vinci/pom.xml                        |  32 +-
 uimaj-bootstrap/pom.xml                            |   2 +-
 uimaj-component-test-util/pom.xml                  |   2 +-
 uimaj-core/.gitignore                              |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-core/pom.xml                                 |  94 ++--
 .../src/main/java/org/apache/uima/UimaContext.java |  58 +-
 .../impl/PrimitiveAnalysisEngine_impl.java         |  10 +-
 .../org/apache/uima/cas/CASRuntimeException.java   |   6 -
 .../org/apache/uima/cas/impl/FSClassRegistry.java  |  76 ++-
 .../org/apache/uima/cas/impl/TypeSystemImpl.java   |  34 +-
 .../org/apache/uima/impl/UimaContext_ImplBase.java |   9 +-
 .../apache/uima/internal/util/UIMAClassLoader.java |  15 +-
 .../resource/impl/RelativePathResolver_impl.java   |  19 +-
 .../apache/uima/spi/FsIndexCollectionProvider.java |  27 +
 .../org/apache/uima/spi/JCasClassProvider.java     |  27 +
 .../apache/uima/spi/TypePrioritiesProvider.java    |  27 +
 .../uima/spi/TypeSystemDescriptionProvider.java    |  27 +
 .../java/org/apache/uima/util/TypeSystemUtil.java  |  61 ++
 .../apache/uima/util/impl/Log4jLogger_impl.java    |   9 +-
 .../apache/uima/UIMAException_Messages.properties  |   7 +-
 .../apache/uima/cas/impl/FSClassRegistryTest.java  |  16 +
 .../apache/uima/cas/impl/TypeSystemImplTest.java   |  99 ++++
 .../org/apache/uima/impl/UimaContext_implTest.java |  17 +-
 .../java/org/apache/uima/jcas/test/JCasTest.java   |  28 -
 .../java/org/apache/uima/jcas/test/generatedx.xml  | 621 +++++++++++----------
 .../uima/spi/JCasClassProviderForTesting.java      |  33 ++
 .../test/java/org/apache/uima/spi/SpiSentence.java |  99 ++++
 .../test/java/org/apache/uima/spi/SpiToken.java    |  99 ++++
 .../services/org.apache.uima.spi.JCasClassProvider |   1 +
 uimaj-cpe/.gitignore                               |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-cpe/pom.xml                                  |  28 +-
 uimaj-document-annotation/pom.xml                  |   2 +-
 uimaj-eclipse-feature-runtime/.gitignore           |   3 -
 uimaj-eclipse-feature-runtime/feature.properties   | 153 -----
 uimaj-eclipse-feature-runtime/feature.xml          | 162 ++++++
 ...eature => marker-file-identifying-tycho-module} |   0
 uimaj-eclipse-feature-runtime/pom.xml              |  18 +-
 .../src/main/resources/feature.xml                 |  51 --
 uimaj-eclipse-feature-tools/.gitignore             |   3 -
 uimaj-eclipse-feature-tools/feature.properties     | 156 ------
 uimaj-eclipse-feature-tools/feature.xml            | 232 ++++++++
 .../marker-file-identifying-tycho-module           |   0
 uimaj-eclipse-feature-tools/pom.xml                |  55 +-
 .../src/main/resources/feature.xml                 | 115 ----
 .../pom.xml                                        |  49 +-
 uimaj-eclipse-update-site/.gitignore               |   1 -
 .../{src/main/resources => }/category.xml          |   4 +-
 .../marker-file-identifying-tycho-module           |   0
 uimaj-eclipse-update-site/pom.xml                  | 324 ++---------
 uimaj-ep-cas-editor-ide/.gitignore                 |   1 +
 uimaj-ep-cas-editor-ide/pom.xml                    |   2 +-
 uimaj-ep-cas-editor/.gitignore                     |   1 +
 uimaj-ep-cas-editor/pom.xml                        |   2 +-
 uimaj-ep-configurator/.gitignore                   |   1 +
 uimaj-ep-configurator/pom.xml                      |   2 +-
 uimaj-ep-debug/.gitignore                          |   1 +
 uimaj-ep-debug/pom.xml                             |   2 +-
 uimaj-ep-jcasgen/.gitignore                        |   1 +
 uimaj-ep-jcasgen/pom.xml                           |   2 +-
 uimaj-ep-launcher/.gitignore                       |   1 +
 uimaj-ep-launcher/pom.xml                          |   2 +-
 uimaj-ep-pear-packager/.gitignore                  |   1 +
 uimaj-ep-pear-packager/pom.xml                     |   2 +-
 uimaj-ep-runtime/.gitignore                        |   1 +
 uimaj-ep-runtime/pom.xml                           |   7 +-
 uimaj-examples/pom.xml                             |   2 +-
 uimaj-json/pom.xml                                 |   2 +-
 uimaj-legacy-jira-report/pom.xml                   |  20 +-
 uimaj-parent/pom.xml                               |  82 +--
 uimaj-test-util/pom.xml                            |   2 +-
 uimaj-tools/.gitignore                             |   1 +
 .../marker-file-identifying-osgi-bundle            |   0
 uimaj-tools/pom.xml                                | 171 +++---
 uimaj-v3migration-jcas/pom.xml                     |  23 +-
 .../apache/uima/migratev3/jcas/MigrateJCas.java    | 110 ++--
 .../uima/migratev3/jcas}/UimaDecompiler.java       |   2 +-
 112 files changed, 2970 insertions(+), 1629 deletions(-)