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/11 15:25:42 UTC
[uima-uimaj] 01/01: Merge branch 'main' into refactoring/UIMA-6444-Automatically-sign-Eclipse-plugins-during-release-builds
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/UIMA-6444-Automatically-sign-Eclipse-plugins-during-release-builds
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 4abc5f0f3cb5fb9d7d7f526894d97d6bac2db12d
Merge: c0a1000ea 57bc1bb8c
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Jan 11 16:25:29 2023 +0100
Merge branch 'main' into refactoring/UIMA-6444-Automatically-sign-Eclipse-plugins-during-release-builds
* main: (94 commits)
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.
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimaj-3.3.1
Issue #258: Apache UIMA Java SDK 3.3.1 release
Issue #258: Apache UIMA Java SDK 3.3.1 release
Issue #258: Apache UIMA Java SDK 3.3.1 release
Issue #260: Issues-fixed report for GitHub and Jira
Issue #258: Apache UIMA Java SDK 3.3.1 release
Issue #258: Apache UIMA Java SDK 3.3.1 release
Issue #258: Apache UIMA Java SDK 3.3.1 release
Issue #255: File handle leak accessing performanceTuning.properties
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
...
% Conflicts:
% uimaj-parent/pom.xml
.asf.yaml | 66 ++-
.github/PULL_REQUEST_TEMPLATE.md | 4 +-
.gitignore | 1 -
Jenkinsfile | 4 +-
PearPackagingMavenPlugin/pom.xml | 23 +-
README.md | 4 +-
RELEASE_NOTES.md | 68 +--
aggregate-uimaj-docbooks/pom.xml | 1 +
jVinci/.gitignore | 1 +
jVinci/marker-file-identifying-osgi-bundle | 0
jVinci/pom.xml | 64 ++-
jcasgen-maven-plugin/pom.xml | 11 +-
marker-file-enabling-auto-staging | 0
marker-file-enabling-tycho-release | 0
marker-file-identifying-parent-pom | 0
pom.xml | 119 +---
src/main/eclipse/org.eclipse.jdt.core.prefs | 9 +
src/main/eclipse/org.eclipse.jdt.ui.prefs | 2 +-
stage-relesase-artifacts.sh | 49 --
.../pom.xml | 15 +-
.../src/docs/asciidoc/common_book_info.adoc | 42 ++
.../src/docs/asciidoc/uv3.maven.adoc | 90 +++
.../src/docs/asciidoc/uv3.one-time-setup.adoc | 77 +++
.../src/docs/asciidoc/uv3.project_structure.adoc | 52 ++
.../src/docs/asciidoc/uv3.release.adoc | 584 +++++++++++++++++++
.../docs/asciidoc/version_3_maintainers_guide.adoc | 27 +-
uima-doc-v3-users-guide/pom.xml | 2 +-
.../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 +-
uimaj-adapter-vinci/.gitignore | 1 +
.../marker-file-identifying-osgi-bundle | 0
uimaj-adapter-vinci/pom.xml | 30 +-
uimaj-core/.gitignore | 1 +
uimaj-core/marker-file-identifying-osgi-bundle | 0
uimaj-core/pom.xml | 92 ++-
.../src/main/java/org/apache/uima/UimaContext.java | 58 +-
.../org/apache/uima/cas/CASRuntimeException.java | 7 +
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 2 +-
.../java/org/apache/uima/cas/impl/CASImpl.java | 13 +-
.../org/apache/uima/cas/impl/FSClassRegistry.java | 76 ++-
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 5 +-
.../org/apache/uima/cas/impl/TypeSystemImpl.java | 2 +-
.../org/apache/uima/impl/UIMAFramework_impl.java | 7 +-
.../org/apache/uima/impl/UimaContext_ImplBase.java | 9 +-
.../apache/uima/internal/util/UIMAClassLoader.java | 15 +-
.../java/org/apache/uima/pear/util/FileUtil.java | 438 +++++++--------
.../resource/impl/RelativePathResolver_impl.java | 21 +-
.../apache/uima/spi/FsIndexCollectionProvider.java | 27 +
.../org/apache/uima/spi/JCasClassProvider.java | 27 +
.../apache/uima/spi/TypePrioritiesProvider.java | 27 +
.../uima/spi/TypeSystemDescriptionProvider.java | 27 +
.../main/java/org/apache/uima/util/CasIOUtils.java | 1 -
.../java/org/apache/uima/util/TypeSystemUtil.java | 61 ++
.../apache/uima/util/impl/Log4jLogger_impl.java | 19 +-
.../apache/uima/UIMAException_Messages.properties | 1 +
.../apache/uima/cas/impl/FSClassRegistryTest.java | 16 +
.../apache/uima/cas/impl/SelectFsNoJCasTest.java | 27 +-
.../org/apache/uima/cas/impl/SerDesForm6Test.java | 10 -
...rializationDeserialization_BINARY_TSI_Test.java | 2 +-
...asSerializationDeserialization_BINARY_Test.java | 2 +-
...serialization_COMPRESSED_FILTERED_TSI_Test.java | 2 +-
...izationDeserialization_SERIALIZED_TSI_Test.java | 2 +-
...izationDeserialization_XMI_1_0_PRETTY_Test.java | 28 +-
...izationDeserialization_XMI_1_1_PRETTY_Test.java | 1 +
.../uima/cas/serdes/CasToComparableText.java | 4 +-
.../uima/cas/serdes/SerDesCasIOTestUtils.java | 25 +
.../datasuites/MultiFeatureRandomCasDataSuite.java | 12 +-
.../ProgrammaticallyCreatedCasDataSuite.java | 160 +++++-
.../generators/MultiFeatureRandomCasGenerator.java | 69 ++-
.../cas/serdes/scenario/DesSerTestScenario.java | 6 +
.../org/apache/uima/impl/UimaContext_implTest.java | 17 +-
.../java/org/apache/uima/jcas/test/JCasTest.java | 36 +-
.../java/org/apache/uima/jcas/test/generatedx.xml | 621 +++++++++++----------
.../util/PearInstallationVerificationTest.java | 13 +-
.../impl/RelativePathResolver_implTest.java | 6 +-
.../uima/spi/JCasClassProviderForTesting.java | 33 ++
.../test/java/org/apache/uima/spi/SpiSentence.java | 99 ++++
.../test/java/org/apache/uima/spi/SpiToken.java | 99 ++++
.../java/org/apache/uima/util/CasIOUtilsTest.java | 40 ++
.../java/org/apache/uima/util/FileUtilsTest.java | 38 +-
.../{casWithFsList => casWithArrays}/cas.bin | Bin 3204 -> 3092 bytes
.../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../{casWithFsList => casWithLists}/cas.bin | Bin
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../ser-ref/casWithArrays/cas.bin | Bin 0 -> 584 bytes
.../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../ser-ref/casWithArrays}/typesystem.xml | 48 +-
.../{casWithFsList => casWithLists}/cas.bin | Bin
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../{casWithFsList => casWithLists}/typesystem.xml | 0
.../{casWithFsList => casWithArrays}/cas.bin | Bin 2868 -> 2856 bytes
.../debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../typesystem.xml | 48 +-
.../{casWithFsList => casWithLists}/cas.bin | Bin
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../{casWithFsList => casWithLists}/typesystem.xml | 0
.../{casWithFsList => casWithArrays}/cas.bin | Bin 3603 -> 3491 bytes
.../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../{casWithFsList => casWithLists}/cas.bin | Bin
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../ser-ref/casWithArrays/cas.xcas | 67 +++
.../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../ser-ref/casWithArrays}/typesystem.xml | 48 +-
.../{casWithFsList => casWithLists}/cas.xcas | 0
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../{casWithFsList => casWithLists}/typesystem.xml | 0
.../ser-ref/casWithArrays/data.xmi | 29 +
.../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../ser-ref/casWithArrays}/typesystem.xml | 48 +-
.../{casWithFsList => casWithLists}/data.xmi | 0
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../{casWithFsList => casWithLists}/typesystem.xml | 0
.../ser-ref/casWithArrays/data.xmi | 29 +
.../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +-
.../ser-ref/casWithArrays/debug.xmi | 29 +
.../ser-ref/casWithArrays}/typesystem.xml | 48 +-
.../{casWithFsList => casWithLists}/data.xmi | 0
.../debug-typesystem.xml | 0
.../{casWithFsList => casWithLists}/debug.xmi | 0
.../{casWithFsList => casWithLists}/typesystem.xml | 0
.../services/org.apache.uima.spi.JCasClassProvider | 1 +
uimaj-cpe/.gitignore | 1 +
uimaj-cpe/marker-file-identifying-osgi-bundle | 0
uimaj-cpe/pom.xml | 26 +
uimaj-eclipse-feature-runtime/feature.xml | 2 +-
uimaj-eclipse-feature-runtime/pom.xml | 7 +-
uimaj-eclipse-feature-tools/feature.xml | 4 +-
uimaj-eclipse-feature-tools/pom.xml | 21 +-
uimaj-eclipse-maven-p2-site/pom.xml | 2 +-
uimaj-eclipse-update-site/category.xml | 4 +-
uimaj-eclipse-update-site/pom.xml | 4 +-
uimaj-ep-cas-editor-ide/.gitignore | 1 +
uimaj-ep-cas-editor/.gitignore | 1 +
uimaj-ep-configurator/.gitignore | 1 +
uimaj-ep-debug/.gitignore | 1 +
uimaj-ep-jcasgen/.gitignore | 1 +
uimaj-ep-launcher/.gitignore | 1 +
uimaj-ep-pear-packager/.gitignore | 1 +
uimaj-ep-runtime/.gitignore | 1 +
uimaj-legacy-jira-report/pom.xml | 73 +++
uimaj-parent/pom.xml | 157 +++---
uimaj-tools/.gitignore | 1 +
uimaj-tools/marker-file-identifying-osgi-bundle | 0
uimaj-tools/pom.xml | 171 +++---
uimaj-v3migration-jcas/pom.xml | 21 +-
.../apache/uima/migratev3/jcas/MigrateJCas.java | 110 ++--
.../uima/migratev3/jcas}/UimaDecompiler.java | 2 +-
160 files changed, 3706 insertions(+), 1544 deletions(-)
diff --cc uimaj-parent/pom.xml
index 53fb54f47,7d8982ee8..6e733bb66
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@@ -122,18 -136,6 +136,8 @@@
</pluginRepositories>
<properties>
- <!-- versions >= 2.7.1 seem to have a bug that they embed bundle JARs -->
- <tycho-version>2.7.3-SNAPSHOT</tycho-version>
+ <tycho-include-gpg-signatures>false</tycho-include-gpg-signatures>
+
<!--
Configuring settings is best done through default properties that multiple plugins.
Local configurations within plugins should be avoided. Where plugins do not pick up default