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 6859eec56b153e2bab1981751e73226c0f2b8575 Merge: 84b8dcf 9d5fb49 Author: Richard Eckart de Castilho <r...@apache.org> AuthorDate: Wed Nov 10 18:35:16 2021 +0100 Merge pull request #155 from apache/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk [UIMA-6393]: Circular imports break resource manager cache .../uima/resource/impl/ResourceManager_impl.java | 16 + .../uima/resource/metadata/FsIndexCollection.java | 3 + .../uima/resource/metadata/TypePriorities.java | 3 + .../resource/metadata/TypeSystemDescription.java | 3 + .../FsIndexCollectionImportResolverAdapter.java | 79 +++ .../metadata/impl/FsIndexCollection_impl.java | 106 +---- .../resource/metadata/impl/ImportResolver.java | 284 +++++++++++ .../impl/TypePrioritiesImportResolverAdapter.java | 79 +++ .../metadata/impl/TypePriorities_impl.java | 105 +--- ...TypeSystemDescriptionImportResolverAdapter.java | 78 +++ .../metadata/impl/TypeSystemDescription_impl.java | 100 +--- .../resource/metadata/impl/ImportResolverTest.java | 528 +++++++++++++++++++++ .../impl/TypeSystemDescription_implTest.java | 129 +++-- .../Loop-with-2-nodes-1.xml} | 73 +-- .../Loop-with-2-nodes-2.xml} | 73 +-- .../Loop-with-3-nodes-1.xml} | 73 +-- .../Loop-with-3-nodes-2.xml} | 73 +-- .../Loop-with-3-nodes-3.xml} | 73 +-- .../SelfImport.xml} | 73 +-- .../Transitive-with-3-nodes-1.xml} | 73 +-- .../Transitive-with-3-nodes-2.xml} | 73 +-- .../Transitive-with-3-nodes-3.xml} | 72 +-- .../complexImportScenario1/tsd0.xml} | 81 ++-- .../complexImportScenario1/tsd1.xml} | 76 +-- .../complexImportScenario1/tsd2.xml} | 79 +-- .../complexImportScenario1/tsd3.xml} | 73 +-- .../complexImportScenario1/tsd4.xml} | 81 ++-- .../complexImportScenario1/tsd5.xml} | 77 +-- .../complexImportScenario1/tsd6.xml} | 73 +-- .../TypeSystemDescriptionImplTest/Circular1.xml | 39 -- .../TypeSystemDescriptionImplTest/Circular2.xml | 38 -- .../test/resources/{log4j2.xml => log4j2-test.xml} | 6 +- 32 files changed, 1781 insertions(+), 1011 deletions(-)