This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 1fbd9971b0720a76167aa592b1a51422edc9f4dc Merge: 626ad7fc9 68561e32b Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Wed Sep 24 11:27:28 2025 +0200 Merge branch 'release/3.6.x' * release/3.6.x: Issue #438: Upgrade dependencies (3.6.1) No issue: Pull notifications up to root Issue #430: Resolving type system imports through sp is slows things down too much Issue #435: Improve performance of ImportResolver Issue #435: Improve performance of ImportResolver Issue #435: Improve performance of ImportResolver Issue #435: Improve performance of ImportResolver Issue #435: Improve performance of ImportResolver Issue #435: Improve performance of ImportResolver Issue #435: Improve performance of ImportResolver Issue #431: Issue using SPI-enabled type systems embedded into PEARs Issue #430: Resolving type system imports through SPIs slows things down too much Issue #430: Resolving type system imports through SPIs slows things down too much Issue #430: Resolving type system imports through SPIs slows things down too much .asf.yaml | 12 +- pom.xml | 2 +- src/main/assembly/bin-without-jackson.xml | 2 +- src/main/bin_distr_license_notices/LICENSE.txt | 4 +- .../NOTICE-without-jackson.md | 6 +- src/main/bin_distr_license_notices/NOTICE.md | 8 +- .../org/apache/uima/tools/bnd/UimaBndPlugin.java | 86 +++- uimafit-maven-plugin/pom.xml | 2 +- .../uima/fit/maven/GenerateDescriptorsMojo.java | 2 +- uimaj-core/pom.xml | 3 +- .../java/org/apache/uima/cas/SerialFormat.java | 14 +- .../uima/internal/util/ClassLoaderUtils.java | 58 +-- .../uima/internal/util/ServiceLoaderUtil.java | 38 +- .../apache/uima/resource/RelativePathResolver.java | 2 +- .../resource/impl/RelativePathResolver_impl.java | 138 ++++-- .../uima/resource/impl/ResourceManager_impl.java | 5 +- .../resource/metadata/impl/ImportResolver.java | 74 ++- .../org/apache/uima/util/impl/Settings_impl.java | 19 +- .../impl/AnalysisEngine_implTest.java | 497 ++++++++++----------- .../apache/uima/cas/impl/TypeSystemImplTest.java | 8 +- .../uima/internal/util/MultiThreadUtils.java | 3 + .../org/apache/uima/jcas/impl/JCasHashMapTest.java | 15 +- .../asciidoc/ref/ref.xml.component_descriptor.adoc | 32 +- .../uima/it/pear_with_typesystem/PearIT.java | 2 +- uimaj-parent-internal/pom.xml | 32 +- 25 files changed, 608 insertions(+), 456 deletions(-)
