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 2022/07/13 07:28:03 UTC
[uima-uimaj] branch no-issue-merge-3_3_x_branch created (now 9fc6d00c8)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch no-issue-merge-3_3_x_branch
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
at 9fc6d00c8 Merge branch 'maintenance/3.3.x' into no-issue-merge-3_3_x_branch
This branch includes the following new commits:
new 9fc6d00c8 Merge branch 'maintenance/3.3.x' into no-issue-merge-3_3_x_branch
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 'maintenance/3.3.x' into no-issue-merge-3_3_x_branch
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch no-issue-merge-3_3_x_branch
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 9fc6d00c800976f3a1d87dc5d1c40bc8220ccc62
Merge: a79b9abdb 1e0817216
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Jul 13 09:27:59 2022 +0200
Merge branch 'maintenance/3.3.x' into no-issue-merge-3_3_x_branch
* maintenance/3.3.x:
[UIMA-6454] Update dependencies (UIMA Java SDK 3.3.1)
[UIMA-6480] Add tests with empty arrays to CAS de/ser-suite
[UIMA-6480] Add tests with empty arrays to CAS de/ser-suite
[UIMA-6479] PearPackagingMavenPlugin has ancient JUnit dependency
[UIMA-6473] CasToComparableText is broken
[UIMA-6463] Use toolchains to ensure compatibility with Java 1.8
% Conflicts:
% uimaj-parent/pom.xml
PearPackagingMavenPlugin/pom.xml | 22 +--
jcasgen-maven-plugin/pom.xml | 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 +-
.../datasuites/MultiFeatureRandomCasDataSuite.java | 12 +-
.../ProgrammaticallyCreatedCasDataSuite.java | 160 ++++++++++++++++++++-
.../generators/MultiFeatureRandomCasGenerator.java | 69 ++++++++-
.../{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
uimaj-parent/pom.xml | 17 ++-
65 files changed, 886 insertions(+), 349 deletions(-)
diff --cc uimaj-parent/pom.xml
index f1363343b,4723617c6..64114b175
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@@ -238,10 -239,10 +238,10 @@@
<pluginManagement>
<plugins>
<plugin>
-- <!-- Can be removed after updating to the UIMA Parent POM 15 or higher -->
++ <!-- Can be removed after updating to the UIMA Parent POM 16 or higher -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
-- <version>3.6.1</version>
++ <version>3.6.4</version>
</plugin>
</plugins>
</pluginManagement>
@@@ -250,6 -251,7 +250,8 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
++ <!-- Version can be removed after updating to the UIMA Parent POM 16 or higher -->
+ <version>3.1.0</version>
<executions>
<execution>
<goals>
@@@ -265,12 -267,18 +267,20 @@@
</toolchains>
</configuration>
</plugin>
+
+ <plugin>
++ <!-- Can be removed after updating to the UIMA Parent POM 16 or higher -->
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>4.7.0.0</version>
+ </plugin>
<plugin>
<!-- See: https://issues.apache.org/jira/browse/UIMA-6349 -->
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
-- <version>0.15.3</version>
++ <!-- Version can be removed after updating to the UIMA Parent POM 16 or higher -->
++ <version>0.15.7</version>
<configuration>
<parameter>
<ignoreMissingClassesByRegularExpressions>
@@@ -280,6 -288,6 +290,7 @@@
</configuration>
<dependencies>
<dependency>
++ <!-- Need to check if we still need this with 0.15.7 and if yes move to UIMA Parent POM -->
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
<version>2.5.14</version>