[uima-uimaj] branch refactoring/325-Update-dependencies updated (0de7cbac4 -> 5d71885db)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/325-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git omit 0de7cbac4 Issue #325: Update dependencies add 5d71885db Issue #325: Update dependencies This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0de7cbac4) \ N -- N -- N refs/heads/refactoring/325-Update-dependencies (5d71885db) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: uimaj-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-parent-pom] branch refactoring/39-Upgrade-plugins deleted (was 47ec6d2)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/39-Upgrade-plugins in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git was 47ec6d2 #39 - Upgrade plugins The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[uima-parent-pom] branch main updated (7c7ea97 -> 688e046)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git from 7c7ea97 Merge pull request #36 from apache/release/35-UIMA-Parent-POM-16 add 47ec6d2 #39 - Upgrade plugins new 688e046 Merge pull request #40 from apache/refactoring/39-Upgrade-plugins 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. Summary of changes: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[uima-parent-pom] 01/01: Merge pull request #40 from apache/refactoring/39-Upgrade-plugins
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-parent-pom.git commit 688e046babac70c048721fbd9dd84a59ceaa746b Merge: 7c7ea97 47ec6d2 Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 15:34:05 2023 +0200 Merge pull request #40 from apache/refactoring/39-Upgrade-plugins #39 - Upgrade plugins pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[uima-parent-pom] 01/01: #39 - Upgrade plugins
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/39-Upgrade-plugins in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git commit 47ec6d2adc22e9adb6e909597e310eee8a86aa10 Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 14:14:26 2023 +0200 #39 - Upgrade plugins - Minimum Maven version 3.6.3 -> 3.9.3 - Minimum build-time Java version 11 -> 17 - tycho 2.7.5 -> 3.0.5 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f91ecff..b02e0aa 100644 --- a/pom.xml +++ b/pom.xml @@ -149,10 +149,10 @@ -3.6.3 +3.9.3 -11 +17 3.3.0 512m @@ -2960,7 +2960,7 @@ -2.7.5 +3.0.5
[uima-parent-pom] branch refactoring/39-Upgrade-plugins created (now 47ec6d2)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/39-Upgrade-plugins in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git at 47ec6d2 #39 - Upgrade plugins This branch includes the following new commits: new 47ec6d2 #39 - Upgrade plugins 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: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/325-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 0de7cbac4ef7046c9d2d43f18193e656ba8ef442 Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 12:59:06 2023 +0200 Issue #325: Update dependencies * UIMA Parent POM 16 -> 17-SNAPSHOT (for Tycho 3.0.5) --- jcasgen-maven-plugin/src/it/classpath/pom.xml | 17 - jcasgen-maven-plugin/src/it/m2e/pom.xml | 11 ++- .../src/it/multimodule/crossref1/pom.xml| 17 - .../src/it/multimodule/crossref2/pom.xml| 17 - jcasgen-maven-plugin/src/it/simple/pom.xml | 17 - uimaj-parent/pom.xml| 2 +- 6 files changed, 19 insertions(+), 62 deletions(-) diff --git a/jcasgen-maven-plugin/src/it/classpath/pom.xml b/jcasgen-maven-plugin/src/it/classpath/pom.xml index a76f9304c..5511cdb19 100644 --- a/jcasgen-maven-plugin/src/it/classpath/pom.xml +++ b/jcasgen-maven-plugin/src/it/classpath/pom.xml @@ -23,20 +23,11 @@ test classpath 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/jcasgen-maven-plugin/src/it/m2e/pom.xml b/jcasgen-maven-plugin/src/it/m2e/pom.xml index 7157517fe..000d403e5 100644 --- a/jcasgen-maven-plugin/src/it/m2e/pom.xml +++ b/jcasgen-maven-plugin/src/it/m2e/pom.xml @@ -44,20 +44,13 @@ 0.15.0 @project.version@ @localRepositoryUrl@ +1.8 +1.8 - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - org.eclipse.tycho tycho-surefire-plugin diff --git a/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml b/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml index 016706cfb..92942c832 100644 --- a/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml +++ b/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml @@ -23,20 +23,11 @@ test crossref1 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml b/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml index 1d22424e0..a48827ffd 100644 --- a/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml +++ b/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml @@ -23,20 +23,11 @@ test crossref2 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/jcasgen-maven-plugin/src/it/simple/pom.xml b/jcasgen-maven-plugin/src/it/simple/pom.xml index aeb24551b..6395e393f 100644 --- a/jcasgen-maven-plugin/src/it/simple/pom.xml +++ b/jcasgen-maven-plugin/src/it/simple/pom.xml @@ -23,20 +23,11 @@ test simple 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index a84534a2e..cc0a07d78 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -32,7 +32,7 @@ org.apache.uima parent-pom -16 +17-SNAPSHOT uimaj-parent
[uima-uimaj] branch refactoring/325-Update-dependencies created (now 0de7cbac4)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/325-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 0de7cbac4 Issue #325: Update dependencies This branch includes the following new commits: new 0de7cbac4 Issue #325: Update dependencies 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] branch no-issue-merge-3.4.x created (now 74a7dff9e)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch no-issue-merge-3.4.x in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 74a7dff9e Merge branch 'release/3.4.x' into no-issue-merge-3.4.x This branch includes the following new commits: new 74a7dff9e Merge branch 'release/3.4.x' into no-issue-merge-3.4.x 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 'release/3.4.x' into no-issue-merge-3.4.x
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch no-issue-merge-3.4.x in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 74a7dff9e62a875b58f74eda47a2ff6047c723c9 Merge: 3a395185b f26fa48ac Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 12:00:44 2023 +0200 Merge branch 'release/3.4.x' into no-issue-merge-3.4.x * release/3.4.x: Issue #320: Copy of FsIterator_set_sorted_pear does not retain position Issue #319: SelectFSs_impl.close() creates stream just to close it uimaj-core/pom.xml | 15 +++ .../uima/cas/impl/FsIterator_set_sorted2.java | 6 ++- .../uima/cas/impl/FsIterator_set_sorted_pear.java | 5 ++- .../org/apache/uima/cas/impl/SelectFSs_impl.java | 2 +- .../cas/impl/FsIterator_set_sorted_pearTest.java | 49 ++ uimaj-parent/pom.xml | 25 +-- 6 files changed, 84 insertions(+), 18 deletions(-)
[uima-uimaj] branch refactoring/no-issue-set-version deleted (was ba82b98c1)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/no-issue-set-version in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git was ba82b98c1 No issue: Set version to 3.5.0-SNAPSHOT The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[uima-uimaj] branch main updated (0a44cea2d -> 3a395185b)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git from 0a44cea2d Merge pull request #318 from apache/refactoring/317-Update-dependencies add ba82b98c1 No issue: Set version to 3.5.0-SNAPSHOT new 3a395185b Merge pull request #321 from apache/refactoring/no-issue-set-version 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. Summary of changes: PearPackagingMavenPlugin/pom.xml| 2 +- aggregate-uimaj-docbooks/pom.xml| 2 +- aggregate-uimaj-eclipse-plugins/pom.xml | 2 +- aggregate-uimaj/pom.xml | 2 +- jVinci/pom.xml | 2 +- jcasgen-maven-plugin/pom.xml| 2 +- pom.xml | 2 +- uima-doc-v3-maintainers-guide/pom.xml | 2 +- uima-doc-v3-users-guide/pom.xml | 2 +- uima-docbook-overview-and-setup/pom.xml | 2 +- uima-docbook-references/pom.xml | 2 +- uima-docbook-tools/pom.xml | 2 +- uima-docbook-tutorials-and-users-guides/pom.xml | 2 +- uimaj-adapter-vinci/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-cpe/pom.xml | 2 +- uimaj-document-annotation/pom.xml | 2 +- uimaj-eclipse-feature-runtime/feature.xml | 2 +- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/feature.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 18 +- uimaj-eclipse-maven-p2-site/pom.xml | 2 +- uimaj-eclipse-update-site/category.xml | 4 ++-- uimaj-eclipse-update-site/pom.xml | 6 +++--- uimaj-ep-cas-editor-ide/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml| 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- uimaj-ep-runtime/pom.xml| 2 +- uimaj-examples/pom.xml | 2 +- uimaj-json/pom.xml | 2 +- uimaj-parent/pom.xml| 2 +- uimaj-test-util/pom.xml | 2 +- uimaj-tools/pom.xml | 2 +- uimaj-v3migration-jcas/pom.xml | 2 +- 40 files changed, 53 insertions(+), 53 deletions(-)
[uima-uimaj] 01/01: Merge pull request #321 from apache/refactoring/no-issue-set-version
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 3a395185bab5b8024b516d816ae901db7ff3b8f8 Merge: 0a44cea2d ba82b98c1 Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 11:58:38 2023 +0200 Merge pull request #321 from apache/refactoring/no-issue-set-version No issue: Set version to 3.5.0-SNAPSHOT PearPackagingMavenPlugin/pom.xml| 2 +- aggregate-uimaj-docbooks/pom.xml| 2 +- aggregate-uimaj-eclipse-plugins/pom.xml | 2 +- aggregate-uimaj/pom.xml | 2 +- jVinci/pom.xml | 2 +- jcasgen-maven-plugin/pom.xml| 2 +- pom.xml | 2 +- uima-doc-v3-maintainers-guide/pom.xml | 2 +- uima-doc-v3-users-guide/pom.xml | 2 +- uima-docbook-overview-and-setup/pom.xml | 2 +- uima-docbook-references/pom.xml | 2 +- uima-docbook-tools/pom.xml | 2 +- uima-docbook-tutorials-and-users-guides/pom.xml | 2 +- uimaj-adapter-vinci/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-cpe/pom.xml | 2 +- uimaj-document-annotation/pom.xml | 2 +- uimaj-eclipse-feature-runtime/feature.xml | 2 +- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/feature.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 18 +- uimaj-eclipse-maven-p2-site/pom.xml | 2 +- uimaj-eclipse-update-site/category.xml | 4 ++-- uimaj-eclipse-update-site/pom.xml | 6 +++--- uimaj-ep-cas-editor-ide/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml| 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- uimaj-ep-runtime/pom.xml| 2 +- uimaj-examples/pom.xml | 2 +- uimaj-json/pom.xml | 2 +- uimaj-parent/pom.xml| 2 +- uimaj-test-util/pom.xml | 2 +- uimaj-tools/pom.xml | 2 +- uimaj-v3migration-jcas/pom.xml | 2 +- 40 files changed, 53 insertions(+), 53 deletions(-)
[uima-uimaj] branch refactoring/no-issue-set-version updated (d9795bcf6 -> ba82b98c1)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/no-issue-set-version in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git omit d9795bcf6 No issue: Set version to 3.5.0-SNAPSHOT add ba82b98c1 No issue: Set version to 3.5.0-SNAPSHOT This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d9795bcf6) \ N -- N -- N refs/heads/refactoring/no-issue-set-version (ba82b98c1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: uimaj-eclipse-feature-runtime/feature.xml | 2 +- uimaj-eclipse-feature-tools/feature.xml | 4 ++-- uimaj-eclipse-update-site/category.xml| 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
[uima-uimaj] 01/01: Merge pull request #323 from apache/bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch release/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit f26fa48acc7891908ad2de9467d7d94e90acef84 Merge: 7dc27b39f 42c92c65d Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 09:21:37 2023 +0200 Merge pull request #323 from apache/bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position Issue #320: Copy of FsIterator_set_sorted_pear does not retain position uimaj-core/pom.xml | 15 +++ .../uima/cas/impl/FsIterator_set_sorted2.java | 6 ++- .../uima/cas/impl/FsIterator_set_sorted_pear.java | 5 ++- .../cas/impl/FsIterator_set_sorted_pearTest.java | 49 ++ uimaj-parent/pom.xml | 25 +-- 5 files changed, 83 insertions(+), 17 deletions(-)
[uima-uimaj] branch release/3.4.x updated (7dc27b39f -> f26fa48ac)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.4.x in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git from 7dc27b39f Merge pull request #322 from apache/bugfix/319-SelectFSs_impl-close-creates-stream-just-to-close-it add 42c92c65d Issue #320: Copy of FsIterator_set_sorted_pear does not retain position new f26fa48ac Merge pull request #323 from apache/bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position 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. Summary of changes: uimaj-core/pom.xml | 15 +++ .../uima/cas/impl/FsIterator_set_sorted2.java | 6 ++- .../uima/cas/impl/FsIterator_set_sorted_pear.java | 5 ++- .../cas/impl/FsIterator_set_sorted_pearTest.java | 49 ++ uimaj-parent/pom.xml | 25 +-- 5 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pearTest.java
[uima-uimaj] branch bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position deleted (was 42c92c65d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git was 42c92c65d Issue #320: Copy of FsIterator_set_sorted_pear does not retain position The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
