svn commit: r1856582 - /uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
Author: schor
Date: Fri Mar 29 21:28:14 2019
New Revision: 1856582
URL: http://svn.apache.org/viewvc?rev=1856582=rev
Log:
[maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.0
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
Modified: uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml?rev=1856582=1856581=1856582=diff
==
--- uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml Fri Mar 29
21:28:14 2019
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.0-SNAPSHOT
+ 3.1.0
pom
Apache UIMA Eclipse: ${project.artifactId}
@@ -37,13 +37,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site
+
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.1.0
-
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site
+
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.1.0
-
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site
+
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.1.0
svn commit: r1856584 - /uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
Author: schor
Date: Fri Mar 29 21:28:26 2019
New Revision: 1856584
URL: http://svn.apache.org/viewvc?rev=1856584=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
Modified: uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml?rev=1856584=1856583=1856584=diff
==
--- uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml Fri Mar 29
21:28:26 2019
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.0
+ 3.1.1-SNAPSHOT
pom
Apache UIMA Eclipse: ${project.artifactId}
@@ -37,13 +37,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.1.0
+
scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site
-
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.1.0
+
scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site
-
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.1.0
+
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site
svn commit: r1856581 - in /uima/uv3/uimaj-v3/trunk: ./ PearPackagingMavenPlugin/ aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ jVinci/ jcasgen-maven-plugin/ uima-docbook-
Author: schor Date: Fri Mar 29 20:46:41 2019 New Revision: 1856581 URL: http://svn.apache.org/viewvc?rev=1856581=rev Log: [maven-release-plugin] prepare for next development iteration Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml uima/uv3/uimaj-v3/trunk/jVinci/pom.xml uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml uima/uv3/uimaj-v3/trunk/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-overview-and-setup/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-references/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-tools/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-tutorials-and-users-guides/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-core/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-cpe/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-document-annotation/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-feature-runtime/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-feature-tools/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-debug/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-pear-packager/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-runtime/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-examples/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-test-util/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-tools/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/pom.xml Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml?rev=1856581=1856580=1856581=diff == --- uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml Fri Mar 29 20:46:41 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.0 +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml @@ -44,13 +44,13 @@ element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/PearPackagingMavenPlugin + scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/PearPackagingMavenPlugin + scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin - http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/PearPackagingMavenPlugin + http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml?rev=1856581=1856580=1856581=diff == --- uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml Fri Mar 29 20:46:41 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.0 +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml @@ -42,13 +42,13 @@ element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/aggregate-uimaj-docbooks + scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/aggregate-uimaj-docbooks + scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks - http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/aggregate-uimaj-docbooks + http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=1856581=1856580=1856581=diff
svn commit: r1856580 - /uima/uv3/uimaj-v3/tags/uimaj-3.1.0/
Author: schor Date: Fri Mar 29 20:46:36 2019 New Revision: 1856580 URL: http://svn.apache.org/viewvc?rev=1856580=rev Log: [maven-release-plugin] copy for tag uimaj-3.1.0 Added: uima/uv3/uimaj-v3/tags/uimaj-3.1.0/ (props changed) - copied from r1856579, uima/uv3/uimaj-v3/trunk/ Propchange: uima/uv3/uimaj-v3/tags/uimaj-3.1.0/ -- --- svn:ignore (added) +++ svn:ignore Fri Mar 29 20:46:36 2019 @@ -0,0 +1,5 @@ +.project +.settings +target +issuesFixed +api-change-report Propchange: uima/uv3/uimaj-v3/tags/uimaj-3.1.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Mar 29 20:46:36 2019 @@ -0,0 +1,4 @@ +/uima/uimaj/branches/2.6.0-json:1616936-1617592 +/uima/uimaj/branches/depend-on-july-9-build-tools:963167-964468 +/uima/uimaj/branches/filteredCompress-uima-2498:1436573-1462257 +/uima/uimaj/trunk:1690273-1693269,1782473-1782820
svn commit: r1856579 - in /uima/uv3/uimaj-v3/trunk: ./ PearPackagingMavenPlugin/ aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ jVinci/ jcasgen-maven-plugin/ uima-docbook-
Author: schor Date: Fri Mar 29 20:46:25 2019 New Revision: 1856579 URL: http://svn.apache.org/viewvc?rev=1856579=rev Log: [maven-release-plugin] prepare release uimaj-3.1.0 Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml uima/uv3/uimaj-v3/trunk/jVinci/pom.xml uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml uima/uv3/uimaj-v3/trunk/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-overview-and-setup/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-references/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-tools/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-tutorials-and-users-guides/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-core/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-cpe/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-document-annotation/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-feature-runtime/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-feature-tools/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-debug/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-pear-packager/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-runtime/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-examples/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-test-util/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-tools/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/pom.xml Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml?rev=1856579=1856578=1856579=diff == --- uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml Fri Mar 29 20:46:25 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.0-SNAPSHOT +3.1.0 ../uimaj-parent/pom.xml @@ -44,13 +44,13 @@ element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin + scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/PearPackagingMavenPlugin - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin + scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/PearPackagingMavenPlugin - http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin + http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/PearPackagingMavenPlugin Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml?rev=1856579=1856578=1856579=diff == --- uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml Fri Mar 29 20:46:25 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.0-SNAPSHOT +3.1.0 ../uimaj-parent/pom.xml @@ -42,13 +42,13 @@ element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks + scm:svn:http://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/aggregate-uimaj-docbooks - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks + scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/aggregate-uimaj-docbooks - http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks + http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/tags/uimaj-3.1.0/aggregate-uimaj-docbooks Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=1856579=1856578=1856579=diff
svn commit: r1856577 - /uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml
Author: schor
Date: Fri Mar 29 20:37:06 2019
New Revision: 1856577
URL: http://svn.apache.org/viewvc?rev=1856577=rev
Log:
[UIMA-6018] fix incorrect updating of 3.0.3 to 3.1.0 for other artifacts
Modified:
uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml
Modified: uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml?rev=1856577=1856576=1856577=diff
==
--- uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml Fri Mar 29 20:37:06
2019
@@ -63,12 +63,12 @@
org.apache.maven
maven-plugin-api
- 3.1.0
+ 3.0.3
org.apache.maven
maven-core
- 3.1.0
+ 3.0.3
org.apache.maven.plugin-tools
@@ -101,6 +101,7 @@
jVinci
${project.version}
+
org.sonatype.plexus
plexus-build-api
svn commit: r1856572 - /uima/uv3/uimaj-v3/trunk/RELEASE_NOTES.html
Author: schor Date: Fri Mar 29 18:57:01 2019 New Revision: 1856572 URL: http://svn.apache.org/viewvc?rev=1856572=rev Log: [UIMA-6018] update for version 3.1.0 Modified: uima/uv3/uimaj-v3/trunk/RELEASE_NOTES.html Modified: uima/uv3/uimaj-v3/trunk/RELEASE_NOTES.html URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/RELEASE_NOTES.html?rev=1856572=1856571=1856572=diff == --- uima/uv3/uimaj-v3/trunk/RELEASE_NOTES.html (original) +++ uima/uv3/uimaj-v3/trunk/RELEASE_NOTES.html Fri Mar 29 18:57:01 2019 @@ -20,10 +20,10 @@ --> - Apache UIMA v3.0.2 Release Notes + Apache UIMA v3.1.0 Release Notes -Apache UIMA (Unstructured Information Management Architecture) v3.0.2 Release Notes +Apache UIMA (Unstructured Information Management Architecture) v3.1.0 Release Notes Contents @@ -81,7 +81,7 @@ Major Changes in this Release -Version 3.0.2 is a minor update to 3.0.1. +Version 3.1.0 is a minor update to 3.0.1. When migrating from v2, if non-built-in JCas cover classes are being used, a one-time regeneration or migration step is required for these. @@ -125,7 +125,7 @@ Previously the Context Class Loader was Implemented a destroy() method for ResourceManager which closes its UIMAClassLoader -Specific changes in release 3.0.2 versus 3.0.1 include +Specific changes in release 3.1.0 versus 3.0.1 include supporting additional JCas use cases, where (due to changes in type systems) some feature might migrate over time from subclasses to superclasses. @@ -135,6 +135,10 @@ Previously the Context Class Loader was API changes + + Jira issue https://issues.apache.org/jira/browse/UIMA-5869 changed an exception that is thrown if + a CAS View is missing, from an unchecked exception to a checked exception, which matches what the + JavaDoc for this has always indicated. This may require an adjustment to user code. There is an API compatibility report covering the non-internal APIs; see change report for the list of API changes since version 3.0.1.
svn commit: r1856570 - in /uima/uv3/uimaj-v3/trunk: ./ PearPackagingMavenPlugin/ aggregate-uimaj-docbooks/ aggregate-uimaj-eclipse-plugins/ aggregate-uimaj/ jVinci/ jcasgen-maven-plugin/ uima-docbook-
Author: schor Date: Fri Mar 29 18:54:15 2019 New Revision: 1856570 URL: http://svn.apache.org/viewvc?rev=1856570=rev Log: [UIMA-6018] change 3.0.2 version to 3.1.0 Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml uima/uv3/uimaj-v3/trunk/jVinci/pom.xml uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/pom.xml uima/uv3/uimaj-v3/trunk/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-overview-and-setup/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-references/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-tools/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-tutorials-and-users-guides/pom.xml uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-component-test-util/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-core/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-cpe/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-document-annotation/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-feature-runtime/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-feature-tools/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor-ide/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-debug/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-pear-packager/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-ep-runtime/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-examples/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-json/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-parent/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-test-util/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-tools/pom.xml uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/pom.xml Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml?rev=1856570=1856569=1856570=diff == --- uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/pom.xml Fri Mar 29 18:54:15 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.0.3-SNAPSHOT +3.1.0-SNAPSHOT ../uimaj-parent/pom.xml @@ -64,7 +64,7 @@ org.apache.maven maven-plugin-api - 3.0.3 + 3.1.0 org.apache.maven.plugin-tools Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml?rev=1856570=1856569=1856570=diff == --- uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks/pom.xml Fri Mar 29 18:54:15 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.0.3-SNAPSHOT +3.1.0-SNAPSHOT ../uimaj-parent/pom.xml Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml?rev=1856570=1856569=1856570=diff == --- uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins/pom.xml Fri Mar 29 18:54:15 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.0.3-SNAPSHOT +3.1.0-SNAPSHOT ../uimaj-parent/pom.xml Modified: uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml?rev=1856570=1856569=1856570=diff == --- uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml (original) +++ uima/uv3/uimaj-v3/trunk/aggregate-uimaj/pom.xml Fri Mar 29 18:54:15 2019 @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.0.3-SNAPSHOT +3.1.0-SNAPSHOT ../uimaj-parent/pom.xml Modified: uima/uv3/uimaj-v3/trunk/jVinci/pom.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/pom.xml?rev=1856570=1856569=1856570=diff == --- uima/uv3/uimaj-v3/trunk/jVinci/pom.xml (original) +++
svn commit: r1856569 - in /uima/uv3/uimaj-v3/tags: uimaj-3.0.2/ uimaj-eclipse-update-site-3.0.2/
Author: schor Date: Fri Mar 29 18:50:49 2019 New Revision: 1856569 URL: http://svn.apache.org/viewvc?rev=1856569=rev Log: rc1 cancelled Removed: uima/uv3/uimaj-v3/tags/uimaj-3.0.2/ uima/uv3/uimaj-v3/tags/uimaj-eclipse-update-site-3.0.2/
svn commit: r1856564 - /uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml
Author: schor Date: Fri Mar 29 18:04:56 2019 New Revision: 1856564 URL: http://svn.apache.org/viewvc?rev=1856564=rev Log: no Jira - add a hint on how to avoid equal testing in select iterators Modified: uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml Modified: uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml?rev=1856564=1856563=1856564=diff == --- uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml (original) +++ uima/uv3/uimaj-v3/trunk/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml Fri Mar 29 18:04:56 2019 @@ -447,8 +447,7 @@ startAt(begin, end, shifted) // same as possible; these are described in the next section. The returned Annotations exclude the one(s) which are equal to the bounding FS. - There are several - variations of how this equal test is done, discussed in the next section. + There are several variations of how this equal test is done, discussed in the next section. @@ -544,6 +543,7 @@ startAt(begin, end, shifted) // same as + includeAnnotationsWithEndBeyondBounds @@ -555,13 +555,19 @@ startAt(begin, end, shifted) // same as + skipSameBeginEndType While doing bounded iteration, if the Annotation being returned is identical (has the same -_id()) with the bounding Annotation, it is always skipped. But other annotations, which might -have the same begin, end, and type values, are included by default. - +_id()) with the bounding Annotation, it is always skipped. (Note: if you do not want this, +just make a temporary annotation with the begin/end/type you want, and don't add it to the index; +it will never be found while iterating.) + + +Other annotations, which might +have the same begin, end, and type values, are not skipped, but instead, included, by default. + When this configuration is specified, any Annotation which has the same begin, end, and type is also skipped.
svn commit: r1856563 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
Author: schor
Date: Fri Mar 29 18:02:44 2019
New Revision: 1856563
URL: http://svn.apache.org/viewvc?rev=1856563=rev
Log:
[UIMA-6017] cleaner reporting from cas compare
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java?rev=1856563=1856562=1856563=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
Fri Mar 29 18:02:44 2019
@@ -161,7 +161,7 @@ import org.apache.uima.util.IntEntry;
public class CasCompare {
- private final static boolean IS_DEBUG_STOP_ON_MISCOMPARE = true;
+ private final static boolean IS_DEBUG_STOP_ON_MISCOMPARE = false;
private final static boolean IS_MEAS_LIST_2_ARRAY = false;
private static final String BLANKS_89 = Misc.blanks.substring(0, 89);
@@ -234,6 +234,9 @@ public class CasCompare {
*/
void rmvLast(TOP fs) {
int toBeRemoved = fsList.size() - 1;
+ if (toBeRemoved == -1) {
+System.out.println("debug stop wrong call to rmvLast");
+ }
if (toBeRemoved == usize()) { // means removing the 1st item that looped
back
// 0 1 2 3 4 5 6
// a b c d e f g (c d e f g c d) fsList
@@ -250,7 +253,10 @@ public class CasCompare {
cycleLen = -1; // since the loop is no more, reset the loop info
cycleStart = -1;
}
- fsList.remove(toBeRemoved);
+// System.out.println("debug rmvlast sz b4: " + fsList.size());
+ if (toBeRemoved >= 0) {
+fsList.remove(toBeRemoved);
+ }
}
void addTop() {
@@ -269,6 +275,7 @@ public class CasCompare {
cycleStart = i; // cycleStart is length up to but not including the
start of the cycle
}
}
+// System.out.println("debug add fs sz= "+ (fsList.size() + 1));
fsList.add(fs);
}
@@ -393,12 +400,13 @@ public class CasCompare {
/** if true, continues comparison and reporting after finding the first
miscompare */
private boolean isCompareAll = false;
private boolean isCompareIds = false;
- final private Set excludedRootNames = new HashSet(0);
- final private Set includedTypeNames = new HashSet(0);
- /** key is feature long name (with type) */
- final private Set fsArraysToSort = new HashSet<>();
- /** key is feature long name (with type) */
- final private Set stringArraysToSort = new HashSet<>();
+ private Pair leafErrorReported = null;
+ final private Set excludedRootNames = new HashSet(0);
+ final private Set includedTypeNames = new HashSet(0);
+// /** key is feature long name (with type) */
+// final private Set fsArraysToSort = new HashSet<>();
+// /** key is feature long name (with type) */
+// final private Set stringArraysToSort = new HashSet<>();
//private boolean compareFSArraysAsSets = false;
@@ -409,11 +417,12 @@ public class CasCompare {
/**
* This is used
* - to speed up the compare - avoid comparing the same things multiple
times, instead just use previous result
- * - when doing the comparison to break recursion if asked to compare
the same two things while comaring them.
+ * - when doing the comparison to break recursion if asked to compare
the same two things while comparing them.
*
* value is the result of previous comparison.
*/
private final Map, Integer> prevCompare = new HashMap<>();
+ private final Set> prevReport = new HashSet<>();
private final Prev prev1 = new Prev();
private final Prev prev2 = new Prev();
@@ -433,10 +442,11 @@ public class CasCompare {
private final Map stringCongruenceSets = new HashMap<>();
private boolean isUsingStringCongruenceSets = false;
- private final TypeImpl fsArrayType;
private int maxId1;
private int maxId2;
+ private int miscompare_index; // used to pass back additional value from
compareAllArrayElements
+ private int s1maxLen = 0;
/**
@@ -453,7 +463,6 @@ public class CasCompare {
ts2 = c2.getTypeSystemImpl();
typeMapper = ts1.getTypeSystemMapper(ts2);
isTypeMapping = (null != typeMapper);
-fsArrayType = ts1.fsArrayType;
}
// public void compareStringArraysAsSets(boolean v) {
@@ -568,13 +577,13 @@ public class CasCompare {
}
public List sortFSArray(String typeName, String featureBaseName) {
-fsArraysToSort.add(typeName + ":" + featureBaseName);
+//fsArraysToSort.add(typeName + ":" + featureBaseName);
return type_feature_to_runnable(typeName, featureBaseName, (fs, feat) ->
svn propchange: r1856562 - svn:log
Author: schor Revision: 1856562 Modified property: svn:log Modified: svn:log at Fri Mar 29 17:43:35 2019 -- --- svn:log (original) +++ svn:log Fri Mar 29 17:43:35 2019 @@ -0,0 +1 @@ +no jira - delete old junk commented out code
svn commit: r1856562 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
Author: schor
Date: Fri Mar 29 17:42:49 2019
New Revision: 1856562
URL: http://svn.apache.org/viewvc?rev=1856562=rev
Log: (empty)
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java?rev=1856562=1856561=1856562=diff
==
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
Fri Mar 29 17:42:49 2019
@@ -1233,131 +1233,4 @@ public class Subiterator boundingEnd) {
-//break;
-// }
-// it.moveToNext();
-// if (strict && current.getEnd() > boundingEnd) {
-//continue;
-// }
-// this.list.add(current);
-//}
-// }
-//
-// private void initUnambiguousSubiterator(AnnotationFS annot, final boolean
strict) {
-//final int start = annot.getBegin();
-//final int boundingEnd = annot.getEnd();
-//it.moveToNoReinit(annot);
-//
-//if (it.isValid() && it.get().equals(annot)) {
-// it.moveToNext();
-//}
-//if (!it.isValid()) {
-// return;
-//}
-//annot = it.get();
-//// Skip annotations with begin positions before the given start
-//// position.
-//while (it.isValid() && ((start > annot.getBegin()) || (strict &&
annot.getEnd() > boundingEnd))) {
-// it.moveToNext();
-//}
-//// Add annotations.
-//if (!it.isValid()) {
-// return;
-//}
-//T current = null;
-//while (it.isValid()) {
-// final T next = it.get();
-// // If the next annotation overlaps, skip it. Don't check while there
is no "current" yet.
-// if ((current != null) && (next.getBegin() < current.getEnd())) {
-//it.moveToNext();
-//continue;
-// }
-// // If we're past the boundingEnd, stop.
-// if (next.getBegin() > boundingEnd) {
-//break;
-// }
-// // We have an annotation that's within the boundaries and doesn't
-// // overlap
-// // with the previous annotation. We add this annotation if we're not
-// // strict, or the end position is within the limits.
-// if (!strict || next.getEnd() <= boundingEnd) {
-//current = next;
-//this.list.add(current);
-// }
-// it.moveToNext();
-//}
-///**
-//* Called for begin/end compare, after moveTo(fs)
-//* to eliminate the effect of the type order comparison before any adjustment
for strict.
-//* Move backwards while equal with begin/end iterator.
-//*/
-//private void adjustAfterMoveToForBeginEndComparator(FeatureStructure aFs) {
-// final Annotation fs = (Annotation) aFs;
-// final int begin = fs.getBegin();
-// final int end = fs.getEnd();
-//
-// while (it.isValid()) {
-// Annotation item = it.getNvc();
-// if (item.getBegin() != begin || item.getEnd() != end) {
-// break;
-// }
-// it.moveToPrevious();
-// }
-// // are one position too far, move back one
-// if (it.isValid()) {
-// it.moveToNext();
-// } else {
-// moveToStart();
-// }
-//}
-
-// }
-
}
svn commit: r1856559 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src: main/java/org/apache/uima/cas/ main/java/org/apache/uima/cas/impl/ test/java/org/apache/uima/cas/test/
Author: schor Date: Fri Mar 29 17:32:37 2019 New Revision: 1856559 URL: http://svn.apache.org/viewvc?rev=1856559=rev Log: [UIMA-6016] restructure subiterator class to handle lots of additional edge use cases better. Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java?rev=1856559=1856558=1856559=diff == --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java Fri Mar 29 17:32:37 2019 @@ -94,6 +94,8 @@ public interface SelectFSs * Default is to use feature structure identity comparison (same id()s), not equals, when * doing the test to see if an annotation should be skipped. + * + * This is identical to useAnnotationEquals(true). * @return the updated SelectFSs object */ SelectFSs skipWhenSameBeginEndType(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java?rev=1856559=1856558=1856559=diff == --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted2.java Fri Mar 29 17:32:37 2019 @@ -29,7 +29,7 @@ import org.apache.uima.internal.util.Mis import org.apache.uima.jcas.cas.TOP; /** - * An interator for 1 type for a set or sorted index + * An interator for a single type for a set or sorted index * * NOTE: This is the version used for set/sorted iterators * It is built directly on top of a CopyOnWrite wrapper for OrderedFsSet_array Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java?rev=1856559=1856558=1856559=diff == --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java Fri Mar 29 17:32:37 2019 @@ -19,7 +19,6 @@ package org.apache.uima.cas.impl; -import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -28,7 +27,6 @@ import java.util.function.Predicate; import org.apache.uima.cas.FSComparators; import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.FeatureStructure; -import org.apache.uima.cas.Type; import org.apache.uima.cas.admin.LinearTypeOrder; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.internal.util.Misc; @@ -60,7 +58,7 @@ import org.apache.uima.jcas.tcas.Annotat * --- with or without typePriority * if without typePriority, with or without type == * * - * * redesigned 8/2017 + * * redesigned 8/2017 rechecked 3/2019 * * for skipping, the type is always used, that is * * items are skipped over only if having the same type * * @@ -68,12 +66,12 @@ import org.apache.uima.jcas.tcas.Annotat * - strict (for coveredBy only: skip if end is > bounding Annotation's end) * - positioning (for moveTo) * * - * * redesigned 8/2017 - * * TypeOrderKey is always used + * * redesigned 8/2017 revised 3/2019 + * * TypeOrder specification is always used + * * by passing to underlying iterators as comparator * * - * - NO maybe ignore type priorities while positioning to left-most equal item - * -- NO if ignoring type priorities, maybe still compare types for equal when adjusting - * NO to left-most equal item.
