[uima-uimaj] branch refactoring/339-Drop-CasAnnotationViewerApplet-and-CasTreeViewerApplet created (now 6a8ab16a6)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/339-Drop-CasAnnotationViewerApplet-and-CasTreeViewerApplet in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 6a8ab16a6 Issue #339: Drop CasAnnotationViewerApplet and CasTreeViewerApplet This branch includes the following new commits: new 6a8ab16a6 Issue #339: Drop CasAnnotationViewerApplet and CasTreeViewerApplet 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 refactoring/337-Component-description-editor-may-not-open-in-Eclipse created (now 39e4307e8)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/337-Component-description-editor-may-not-open-in-Eclipse in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 39e4307e8 Issue #337: Component description editor may not open in Eclipse This branch includes the following new commits: new 39e4307e8 Issue #337: Component description editor may not open in Eclipse 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 #337: Component description editor may not open in Eclipse
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/337-Component-description-editor-may-not-open-in-Eclipse
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 39e4307e8ba102350ade625c481130447b0da3ce
Author: Richard Eckart de Castilho
AuthorDate: Wed Aug 9 10:52:38 2023 +0200
Issue #337: Component description editor may not open in Eclipse
- Upgrade to IPreferenceStore and non-deprecated API (at least
non-deprecated in the venerable Eclipse version we build against)
---
.../editors/MultiPageEditorContributor.java| 24 +-
.../files/ContextForPartDialog.java| 8 +---
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git
a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
index afd1d923e..3813de528 100644
---
a/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
+++
b/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditorContributor.java
@@ -23,11 +23,11 @@ import org.apache.uima.taeconfigurator.Messages;
import org.apache.uima.taeconfigurator.PreferencePage;
import org.apache.uima.taeconfigurator.TAEConfiguratorPlugin;
import org.apache.uima.taeconfigurator.editors.xml.XMLEditor;
-import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchActionConstants;
@@ -109,8 +109,9 @@ public class MultiPageEditorContributor extends
MultiPageEditorActionBarContribu
*/
@Override
public void setActiveEditor(IEditorPart part) {
-if (activeEditorPart == part)
+if (activeEditorPart == part) {
return;
+}
if (null == part) {
return;
@@ -190,9 +191,9 @@ public class MultiPageEditorContributor extends
MultiPageEditorActionBarContribu
// to update the checked status to correspond to that
@Override
public void run() {
-TAEConfiguratorPlugin plugin = TAEConfiguratorPlugin.getDefault();
-Preferences prefs = plugin.getPluginPreferences();
+IPreferenceStore prefs =
TAEConfiguratorPlugin.getDefault().getPreferenceStore();
boolean bAutoJCasGen = !prefs.getBoolean(PreferencePage.P_JCAS);
+
autoJCasAction.setChecked(bAutoJCasGen);
prefs.setValue(PreferencePage.P_JCAS, bAutoJCasGen);
}
@@ -203,8 +204,7 @@ public class MultiPageEditorContributor extends
MultiPageEditorActionBarContribu
// to update the checked status to correspond to that
@Override
public void run() {
-TAEConfiguratorPlugin plugin = TAEConfiguratorPlugin.getDefault();
-Preferences prefs = plugin.getPluginPreferences();
+IPreferenceStore prefs =
TAEConfiguratorPlugin.getDefault().getPreferenceStore();
boolean bJCasLimit =
!prefs.getBoolean(PreferencePage.P_JCAS_LIMIT_TO_PROJECT_SCOPE);
limitJCasGenToProject.setChecked(bJCasLimit);
prefs.setValue(PreferencePage.P_JCAS_LIMIT_TO_PROJECT_SCOPE,
bJCasLimit);
@@ -222,8 +222,7 @@ public class MultiPageEditorContributor extends
MultiPageEditorActionBarContribu
qualifiedTypesAction = new Action() {
@Override
public void run() {
-TAEConfiguratorPlugin plugin = TAEConfiguratorPlugin.getDefault();
-Preferences prefs = plugin.getPluginPreferences();
+IPreferenceStore prefs =
TAEConfiguratorPlugin.getDefault().getPreferenceStore();
boolean bFullyQualifiedTypeNames = !prefs
.getBoolean(PreferencePage.P_SHOW_FULLY_QUALIFIED_NAMES);
qualifiedTypesAction.setChecked(bFullyQualifiedTypeNames);
@@ -373,8 +372,7 @@ public class MultiPageEditorContributor extends
MultiPageEditorActionBarContribu
* @return the uima pref string
*/
private static String getUimaPrefString(String key, String defaultValue) {
-TAEConfiguratorPlugin plugin = TAEConfiguratorPlugin.getDefault();
-Preferences prefs = plugin.getPluginPreferences();
+IPreferenceStore prefs =
TAEConfiguratorPlugin.getDefault().getPreferenceStore();
boolean isDefault = prefs.isDefault(key);
if (isDefault) {
prefs.setDefault(key, defaultValue);
@@ -392,8 +390,7 @@ public class MultiPageEditorContributor extends
MultiPageEditorActionBarContribu
* @return the uima pref boolean
*/
private static boolean getUimaPrefBoolean(String key, boolean defaultValue) {
-TAEConfiguratorPlugin plugin = TAEConfiguratorPlugin.getDefault
[uima-uimaj] branch refactoring/335-Remove-dependency-on-JUnit-4-and-JUnit-Assert created (now ace51ffcb)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/335-Remove-dependency-on-JUnit-4-and-JUnit-Assert in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at ace51ffcb Issue #335: Remove dependency on JUnit 4 and JUnit Assert This branch includes the following new commits: new ace51ffcb Issue #335: Remove dependency on JUnit 4 and JUnit Assert 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-parent-pom] 01/01: Issue #53: Add profile for performing dependency checks
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch feature/#53-Add-profile-for-performing-dependency-checks in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git commit bdbcdf325e90a78042ef46d6fe18dd489a9819d9 Author: Richard Eckart de Castilho AuthorDate: Mon Aug 7 18:12:46 2023 +0200 Issue #53: Add profile for performing dependency checks - Added dependency checking profile activated by a marker file --- pom.xml | 32 1 file changed, 32 insertions(+) diff --git a/pom.xml b/pom.xml index 9e8e7f1..1603f42 100644 --- a/pom.xml +++ b/pom.xml @@ -2185,5 +2185,37 @@ + + + dependency-check + + + !disable-dependency-check + + + marker-file-enabling-dependency-check + + + + + +org.apache.maven.plugins +maven-dependency-plugin + + +default +verify + + analyze-only + + + + + true + + + + + \ No newline at end of file
[uima-parent-pom] branch feature/#53-Add-profile-for-performing-dependency-checks created (now bdbcdf3)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/#53-Add-profile-for-performing-dependency-checks in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git at bdbcdf3 Issue #53: Add profile for performing dependency checks This branch includes the following new commits: new bdbcdf3 Issue #53: Add profile for performing dependency checks 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 refactoring/325-Update-dependencies updated: 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
The following commit(s) were added to
refs/heads/refactoring/325-Update-dependencies by this push:
new bb753e953 Issue #325: Update dependencies
bb753e953 is described below
commit bb753e95361e59cf13e66a0abd01dac48ad511c3
Author: Richard Eckart de Castilho
AuthorDate: Mon Aug 7 18:09:26 2023 +0200
Issue #325: Update dependencies
- Remove unnecessary dependency exclusions
---
uimaj-ep-cas-editor-ide/pom.xml | 10 --
uimaj-ep-cas-editor/pom.xml | 11 ---
uimaj-ep-configurator/pom.xml | 10 --
uimaj-ep-debug/pom.xml | 11 ---
uimaj-ep-launcher/pom.xml | 10 --
5 files changed, 52 deletions(-)
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index f92b488ab..6cfcefcc7 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -42,16 +42,6 @@
org.apache.uima
uimaj-core
${project.parent.version}
-
-
- org.bitbucket.mstrobel
- procyon-compilertools
-
-
- org.bitbucket.mstrobel
- procyon-core
-
-
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index 116721a30..edf04e88c 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -43,17 +43,6 @@
org.apache.uima
uimaj-core
${project.parent.version}
- compile
-
-
- org.bitbucket.mstrobel
- procyon-compilertools
-
-
- org.bitbucket.mstrobel
- procyon-core
-
-
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index 443dd138b..08f45e2ad 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -44,16 +44,6 @@
org.apache.uima
uimaj-core
${project.parent.version}
-
-
- org.bitbucket.mstrobel
- procyon-compilertools
-
-
- org.bitbucket.mstrobel
- procyon-core
-
-
diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml
index 62ef3a945..c289fd2aa 100644
--- a/uimaj-ep-debug/pom.xml
+++ b/uimaj-ep-debug/pom.xml
@@ -40,17 +40,6 @@ UIMA data structures to the Eclipse Debug
displays
org.apache.uima
uimaj-core
${project.parent.version}
- compile
-
-
- org.bitbucket.mstrobel
- procyon-compilertools
-
-
- org.bitbucket.mstrobel
- procyon-core
-
-
${eclipseP2RepoId}
diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml
index 80fa8d3d5..09460f686 100644
--- a/uimaj-ep-launcher/pom.xml
+++ b/uimaj-ep-launcher/pom.xml
@@ -39,16 +39,6 @@
org.apache.uima
uimaj-core
${project.parent.version}
-
-
- org.bitbucket.mstrobel
- procyon-compilertools
-
-
- org.bitbucket.mstrobel
- procyon-core
-
-
${eclipseP2RepoId}
[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 811f14339ac2bd72a68ca9fa2476e864e35fb878
Author: Richard Eckart de Castilho
AuthorDate: Mon Aug 7 18:08:15 2023 +0200
Issue #325: Update dependencies
- Set the required execution environment in the OSGI headers to JavaSE-17
---
jVinci/pom.xml | 2 +-
uimaj-adapter-vinci/pom.xml | 2 +-
uimaj-core/pom.xml | 2 +-
uimaj-cpe/pom.xml | 2 +-
uimaj-ep-cas-editor-ide/pom.xml | 1 +
uimaj-ep-cas-editor/pom.xml | 22 --
uimaj-ep-configurator/pom.xml | 1 +
uimaj-ep-debug/pom.xml | 1 +
uimaj-ep-jcasgen/pom.xml| 1 +
uimaj-ep-launcher/pom.xml | 1 +
uimaj-ep-pear-packager/pom.xml | 1 +
uimaj-ep-runtime/pom.xml| 2 +-
uimaj-parent/pom.xml| 1 +
uimaj-tools/pom.xml | 2 +-
14 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/jVinci/pom.xml b/jVinci/pom.xml
index c0002bd1a..77edfeb2a 100644
--- a/jVinci/pom.xml
+++ b/jVinci/pom.xml
@@ -47,7 +47,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml
index 07affc91d..478d00de8 100644
--- a/uimaj-adapter-vinci/pom.xml
+++ b/uimaj-adapter-vinci/pom.xml
@@ -77,7 +77,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
index b03592da9..9a3d262bd 100644
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@ -272,7 +272,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
index 84acdd3a8..bee21cc1b 100644
--- a/uimaj-cpe/pom.xml
+++ b/uimaj-cpe/pom.xml
@@ -99,7 +99,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
org.apache.uima.j-core
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index ae8d49ab4..f92b488ab 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -196,6 +196,7 @@
org.apache.uima.caseditor.editor.styleview,
*
+
${execution.environment}
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index c2da7ed43..116721a30 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -34,16 +34,6 @@
${uimaWebsiteUrl}
-
- org.junit.jupiter
- junit-jupiter-api
- test
-
-
- org.assertj
- assertj-core
- test
-
org.apache.uima.runtime;singleton:=true
-
JavaSE-1.8
+
${execution.environment}
true
registered
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 67e26fb7c..b40c13668 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -158,6 +158,7 @@
17
17
17
+JavaSE-17
org.eclipse.p2.201812
diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml
index 2316c25b1..87c4b553d 100644
--- a/uimaj-tools/pom.xml
+++ b/uimaj-tools/pom.xml
@@ -98,7 +98,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
[uima-uimaj] branch refactoring/325-Update-dependencies created (now 811f14339)
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 811f14339 Issue #325: Update dependencies This branch includes the following new commits: new 811f14339 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-ruta] branch refactoring/no-issue-bump-version updated (0a5e549e -> 52c15b18)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/no-issue-bump-version in repository https://gitbox.apache.org/repos/asf/uima-ruta.git omit 0a5e549e No issue. Set version to 3.4.0-SNAPSHOT add 52c15b18 No issue. Set version to 3.4.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 (0a5e549e) \ N -- N -- N refs/heads/refactoring/no-issue-bump-version (52c15b18) 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: ruta-eclipse-feature/feature.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[uima-ruta] branch refactoring/no-issue-bump-version created (now 0a5e549e)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/no-issue-bump-version in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 0a5e549e No issue. Set version to 3.4.0-SNAPSHOT This branch includes the following new commits: new 0a5e549e No issue. Set version to 3.4.0-SNAPSHOT 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-ruta] 01/01: No issue. Set version to 3.4.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/no-issue-bump-version
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 0a5e549e492d65c71550c0de90e698d31f622dd7
Author: Richard Eckart de Castilho
AuthorDate: Mon Aug 7 15:07:56 2023 +0200
No issue. Set version to 3.4.0-SNAPSHOT
---
example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
example-projects/ruta-maven-example/pom.xml | 2 +-
pom.xml | 2 +-
ruta-core-ext/pom.xml | 2 +-
ruta-core/pom.xml | 2 +-
ruta-docbook/pom.xml| 2 +-
ruta-eclipse-feature/pom.xml| 16
ruta-eclipse-update-site/pom.xml| 4 ++--
ruta-ep-addons/pom.xml | 2 +-
ruta-ep-caseditor/pom.xml | 2 +-
ruta-ep-core-ext/pom.xml| 2 +-
ruta-ep-engine/pom.xml | 2 +-
ruta-ep-ide-ui/pom.xml | 2 +-
ruta-ep-ide/pom.xml | 2 +-
ruta-ep-parent/pom.xml | 2 +-
ruta-ep-textruler/pom.xml | 2 +-
ruta-maven-archetype/pom.xml| 2 +-
ruta-maven-plugin/pom.xml | 2 +-
ruta-parent/pom.xml | 2 +-
19 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/example-projects/ruta-ep-example-extensions/pom.xml
b/example-projects/ruta-ep-example-extensions/pom.xml
index 881be369..54cee2df 100644
--- a/example-projects/ruta-ep-example-extensions/pom.xml
+++ b/example-projects/ruta-ep-example-extensions/pom.xml
@@ -24,7 +24,7 @@
org.apache.uima
ruta-ep-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../../ruta-ep-parent/pom.xml
diff --git a/example-projects/ruta-maven-example/pom.xml
b/example-projects/ruta-maven-example/pom.xml
index d1a6ddc0..202aa92a 100644
--- a/example-projects/ruta-maven-example/pom.xml
+++ b/example-projects/ruta-maven-example/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../../ruta-parent/pom.xml
${uimaWebsiteUrl}
diff --git a/pom.xml b/pom.xml
index 1194ae3f..28e1157e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
ruta-parent/pom.xml
diff --git a/ruta-core-ext/pom.xml b/ruta-core-ext/pom.xml
index d56fcca3..14128bb3 100644
--- a/ruta-core-ext/pom.xml
+++ b/ruta-core-ext/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../ruta-parent/pom.xml
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index d723b58a..acfaec9c 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../ruta-parent/pom.xml
diff --git a/ruta-docbook/pom.xml b/ruta-docbook/pom.xml
index 4a2bfa29..f2a939e3 100644
--- a/ruta-docbook/pom.xml
+++ b/ruta-docbook/pom.xml
@@ -24,7 +24,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../ruta-parent/pom.xml
Apache UIMA Ruta Documentation
diff --git a/ruta-eclipse-feature/pom.xml b/ruta-eclipse-feature/pom.xml
index a625ea98..0bd3af39 100644
--- a/ruta-eclipse-feature/pom.xml
+++ b/ruta-eclipse-feature/pom.xml
@@ -23,7 +23,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../ruta-parent/pom.xml
@@ -44,37 +44,37 @@
org.apache.uima
ruta-ep-addons
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
org.apache.uima
ruta-ep-caseditor
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
org.apache.uima
ruta-ep-core-ext
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
org.apache.uima
ruta-ep-engine
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
org.apache.uima
ruta-ep-ide
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
org.apache.uima
ruta-ep-ide-ui
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
org.apache.uima
ruta-ep-textruler
- 3.3.1-SNAPSHOT
+ 3.4.0-SNAPSHOT
\ No newline at end of file
diff --git a/ruta-eclipse-update-site/pom.xml b/ruta-eclipse-update-site/pom.xml
index 59bb571c..c5ac0d32 100644
--- a/ruta-eclipse-update-site/pom.xml
+++ b/ruta-eclipse-update-site/pom.xml
@@ -24,7 +24,7 @@
org.apache.uima
ruta-parent
-3.3.1-SNAPSHOT
+3.4.0-SNAPSHOT
../ruta-parent/pom.xml
@@ -51,7 +51,7 @@
org.apache.uima
org.apache.uima.ruta.feature
- 3.3.1-SNAPSHOT
[uima-uimaj] 01/01: Merge pull request #332 from apache/refactoring/331-Convert-remaining-documentation-to-asciidoc
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 2b5e11d1a183d7241fdb3df24a0edd2e1d2981bc Merge: ca44916d9 12afea595 Author: Richard Eckart de Castilho AuthorDate: Mon Aug 7 11:12:53 2023 +0200 Merge pull request #332 from apache/refactoring/331-Convert-remaining-documentation-to-asciidoc Refactoring/331 convert remaining documentation to asciidoc aggregate-uimaj-docbooks/pom.xml | 73 - .../src/main/resources/d/index.html| 87 - aggregate-uimaj/pom.xml|3 +- pom.xml|3 +- src/main/assembly/bin.xml | 32 +- uima-doc-v3-maintainers-guide/pom.xml | 149 -- uima-doc-v3-users-guide/pom.xml| 146 - uima-docbook-overview-and-setup/pom.xml| 50 - .../src/docbook/conceptual_overview.xml| 989 --- .../src/docbook/eclipse_setup.xml | 431 --- .../src/docbook/faqs.xml | 411 --- .../src/docbook/glossary.xml | 582 .../src/docbook/known_issues.xml | 68 - .../src/docbook/overview_and_setup.xml | 34 - .../src/docbook/project_overview.xml | 731 - uima-docbook-references/pom.xml| 50 - uima-docbook-references/src/docbook/ref.cas.xml| 1228 - .../src/docbook/ref.compress.xml | 212 -- uima-docbook-references/src/docbook/ref.config.xml | 292 -- .../src/docbook/ref.javadocs.xml | 89 - uima-docbook-references/src/docbook/ref.jcas.xml | 677 - uima-docbook-references/src/docbook/ref.json.xml | 682 - uima-docbook-references/src/docbook/ref.pear.xml | 1016 --- .../src/docbook/ref.resources.xml | 186 -- uima-docbook-references/src/docbook/ref.xmi.xml| 381 --- .../src/docbook/ref.xml.component_descriptor.xml | 2520 -- .../src/docbook/ref.xml.cpe_descriptor.xml | 1375 -- uima-docbook-references/src/docbook/references.xml | 39 - uima-docbook-tools/pom.xml | 50 - .../src/docbook/tools.annotation_viewer.xml| 79 - uima-docbook-tools/src/docbook/tools.caseditor.xml | 639 - uima-docbook-tools/src/docbook/tools.cde.xml | 1450 -- uima-docbook-tools/src/docbook/tools.cpe.xml | 216 -- uima-docbook-tools/src/docbook/tools.cvd.xml | 941 --- .../src/docbook/tools.doc_analyzer.xml | 338 --- .../src/docbook/tools.eclipse_launcher.xml | 96 - uima-docbook-tools/src/docbook/tools.jcasgen.xml | 251 -- .../src/docbook/tools.pear.installer.xml | 119 - .../src/docbook/tools.pear.merger.xml | 164 -- .../src/docbook/tools.pear.packager.maven.xml | 387 --- .../src/docbook/tools.pear.packager.xml| 389 --- uima-docbook-tools/src/docbook/tools.xml | 41 - uima-docbook-tutorials-and-users-guides/pom.xml| 50 - .../docbook/annotator_analysis_engine_guide.xml| 2797 .../src/docbook/tug.aas.xml| 283 -- .../src/docbook/tug.application.xml| 1859 - .../src/docbook/tug.cas_multiplier.xml | 847 -- .../src/docbook/tug.configuration.xml | 119 - .../src/docbook/tug.cpe.xml| 1344 -- .../src/docbook/tug.fc.xml | 396 --- .../src/docbook/tug.multi_views.xml| 660 - .../src/docbook/tug.type_mapping.xml | 140 - .../src/docbook/tug.xmi_emf.xml| 186 -- .../src/docbook/tutorials_and_users_guides.xml | 37 - uimaj-documentation/pom.xml| 308 +++ .../src/docs/asciidoc/maint.adoc | 10 +- .../src/docs/asciidoc/maint}/common_book_info.adoc |0 .../src/docs/asciidoc/maint}/uv3.maven.adoc|0 .../docs/asciidoc/maint}/uv3.one-time-setup.adoc |0 .../asciidoc/maint}/uv3.project_structure.adoc |0 .../src/docs/asciidoc/maint}/uv3.release.adoc |2 +- .../src/docs/asciidoc/oas.adoc | 20 +- .../src/docs/asciidoc/oas}/common_book_info.adoc |0 .../src/docs/asciidoc/oas/conceptual_overview.adoc | 579 .../src/docs/asciidoc/oas/eclipse_setup.adoc | 199 ++ .../src/docs/asciidoc/oas/faqs.adoc| 205 ++ .../src/docs/asciidoc/oas/glossary.adoc| 205 ++ .../conceptual_overview_files/image002.png | Bin .../conceptual_overview_files/image004.png | Bin .../conceptual_overview_files/image006.png | Bin .../conceptual_overview_files/image008.png | Bin
[uima-uimaj] branch refactoring/331-Convert-remaining-documentation-to-asciidoc deleted (was 12afea595)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/331-Convert-remaining-documentation-to-asciidoc in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git was 12afea595 Issue #331: Convert remaining documentation to asciidoc 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 (ca44916d9 -> 2b5e11d1a)
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 ca44916d9 Merge pull request #330 from apache/refactoring/325-Update-dependencies add dc50e5f9a Issue #331: Convert remaining documentation to asciidoc add 6839b7b2a Issue #331: Convert remaining documentation to asciidoc add 399871c34 Issue #331: Convert remaining documentation to asciidoc add 12afea595 Issue #331: Convert remaining documentation to asciidoc new 2b5e11d1a Merge pull request #332 from apache/refactoring/331-Convert-remaining-documentation-to-asciidoc 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: aggregate-uimaj-docbooks/pom.xml | 73 - .../src/main/resources/d/index.html| 87 - aggregate-uimaj/pom.xml|3 +- pom.xml|3 +- src/main/assembly/bin.xml | 32 +- uima-doc-v3-maintainers-guide/pom.xml | 149 -- uima-doc-v3-users-guide/pom.xml| 146 - uima-docbook-overview-and-setup/pom.xml| 50 - .../src/docbook/conceptual_overview.xml| 989 --- .../src/docbook/eclipse_setup.xml | 431 --- .../src/docbook/faqs.xml | 411 --- .../src/docbook/glossary.xml | 582 .../src/docbook/known_issues.xml | 68 - .../src/docbook/overview_and_setup.xml | 34 - .../src/docbook/project_overview.xml | 731 - uima-docbook-references/pom.xml| 50 - uima-docbook-references/src/docbook/ref.cas.xml| 1228 - .../src/docbook/ref.compress.xml | 212 -- uima-docbook-references/src/docbook/ref.config.xml | 292 -- .../src/docbook/ref.javadocs.xml | 89 - uima-docbook-references/src/docbook/ref.jcas.xml | 677 - uima-docbook-references/src/docbook/ref.json.xml | 682 - uima-docbook-references/src/docbook/ref.pear.xml | 1016 --- .../src/docbook/ref.resources.xml | 186 -- uima-docbook-references/src/docbook/ref.xmi.xml| 381 --- .../src/docbook/ref.xml.component_descriptor.xml | 2520 -- .../src/docbook/ref.xml.cpe_descriptor.xml | 1375 -- uima-docbook-references/src/docbook/references.xml | 39 - uima-docbook-tools/pom.xml | 50 - .../src/docbook/tools.annotation_viewer.xml| 79 - uima-docbook-tools/src/docbook/tools.caseditor.xml | 639 - uima-docbook-tools/src/docbook/tools.cde.xml | 1450 -- uima-docbook-tools/src/docbook/tools.cpe.xml | 216 -- uima-docbook-tools/src/docbook/tools.cvd.xml | 941 --- .../src/docbook/tools.doc_analyzer.xml | 338 --- .../src/docbook/tools.eclipse_launcher.xml | 96 - uima-docbook-tools/src/docbook/tools.jcasgen.xml | 251 -- .../src/docbook/tools.pear.installer.xml | 119 - .../src/docbook/tools.pear.merger.xml | 164 -- .../src/docbook/tools.pear.packager.maven.xml | 387 --- .../src/docbook/tools.pear.packager.xml| 389 --- uima-docbook-tools/src/docbook/tools.xml | 41 - uima-docbook-tutorials-and-users-guides/pom.xml| 50 - .../docbook/annotator_analysis_engine_guide.xml| 2797 .../src/docbook/tug.aas.xml| 283 -- .../src/docbook/tug.application.xml| 1859 - .../src/docbook/tug.cas_multiplier.xml | 847 -- .../src/docbook/tug.configuration.xml | 119 - .../src/docbook/tug.cpe.xml| 1344 -- .../src/docbook/tug.fc.xml | 396 --- .../src/docbook/tug.multi_views.xml| 660 - .../src/docbook/tug.type_mapping.xml | 140 - .../src/docbook/tug.xmi_emf.xml| 186 -- .../src/docbook/tutorials_and_users_guides.xml | 37 - uimaj-documentation/pom.xml| 308 +++ .../src/docs/asciidoc/maint.adoc | 10 +- .../src/docs/asciidoc/maint}/common_book_info.adoc |0 .../src/docs/asciidoc/maint}/uv3.maven.adoc|0 .../docs/asciidoc/maint}/uv3.one-time-setup.adoc |0 .../asciidoc/maint}/uv3.project_structure.adoc |0 .../src/docs/asciidoc/maint}/uv3.release.adoc |2 +- .../src/docs/asciidoc/oas.adoc | 20 +- .../src/docs/asciidoc/oas}/common_book_info.adoc |0 .../src/docs/asciidoc/oas/conceptual_overview.adoc
[uima-uimaj] branch refactoring/331-Convert-remaining-documentation-to-asciidoc created (now 12afea595)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/331-Convert-remaining-documentation-to-asciidoc in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 12afea595 Issue #331: Convert remaining documentation to asciidoc This branch includes the following new commits: new dc50e5f9a Issue #331: Convert remaining documentation to asciidoc new 6839b7b2a Issue #331: Convert remaining documentation to asciidoc new 399871c34 Issue #331: Convert remaining documentation to asciidoc new 12afea595 Issue #331: Convert remaining documentation to asciidoc The 4 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] 03/04: Issue #331: Convert remaining documentation to asciidoc
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/331-Convert-remaining-documentation-to-asciidoc in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 399871c348682dc1fe555623a8c663d1c0ec9347 Author: Richard Eckart de Castilho AuthorDate: Fri Aug 4 18:27:35 2023 +0200 Issue #331: Convert remaining documentation to asciidoc - Update assembly with new documentation module - Move image sources out of the asciidoc folder so they do not end up in target / being packaged --- src/main/assembly/bin.xml | 28 ++--- .../ref}/diagrams.pptx | Bin .../image-source => image-source/user}/source.pptx | Bin 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml index 1f2e7ef7d..bb5eaae6f 100644 --- a/src/main/assembly/bin.xml +++ b/src/main/assembly/bin.xml @@ -246,33 +246,9 @@ under the License. 755 - + - uima-docbook-overview-and-setup/target/site/ - docs - 644 - 755 - - - uima-docbook-references/target/site - docs - 644 - 755 - - - uima-docbook-tools/target/site - docs - 644 - 755 - - - uima-docbook-tutorials-and-users-guides/target/site - docs - 644 - 755 - - - uima-doc-v3-users-guide/target/site + uimaj-documentation/target/site/ docs 644 755 diff --git a/uimaj-documentation/src/docs/asciidoc/ref/image-source/diagrams.pptx b/uimaj-documentation/src/docs/image-source/ref/diagrams.pptx similarity index 100% rename from uimaj-documentation/src/docs/asciidoc/ref/image-source/diagrams.pptx rename to uimaj-documentation/src/docs/image-source/ref/diagrams.pptx diff --git a/uimaj-documentation/src/docs/asciidoc/user/image-source/source.pptx b/uimaj-documentation/src/docs/image-source/user/source.pptx similarity index 100% rename from uimaj-documentation/src/docs/asciidoc/user/image-source/source.pptx rename to uimaj-documentation/src/docs/image-source/user/source.pptx
[uima-uimaj] 04/04: Issue #331: Convert remaining documentation to asciidoc
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/331-Convert-remaining-documentation-to-asciidoc
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 12afea595fad82879cbb15c3e16d3af5d620c9cc
Author: Richard Eckart de Castilho
AuthorDate: Fri Aug 4 19:04:35 2023 +0200
Issue #331: Convert remaining documentation to asciidoc
- Disable usage of CDN resources
- Update rat configuration
- Exclude maintainer documentation from binary release
---
aggregate-uimaj/pom.xml | 4 +---
pom.xml | 2 +-
src/main/assembly/bin.xml | 4
uimaj-documentation/pom.xml | 3 ++-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml
index 4f0ae3ae8..704db0cf9 100644
--- a/aggregate-uimaj/pom.xml
+++ b/aggregate-uimaj/pom.xml
@@ -43,9 +43,6 @@
../uimaj-component-test-util
../jVinci
../aggregate-uimaj-eclipse-plugins
-../uimaj-documentation
-../uima-doc-v3-users-guide
-../uima-doc-v3-maintainers-guide
../uimaj-document-annotation
../PearPackagingMavenPlugin
../jcasgen-maven-plugin
@@ -55,5 +52,6 @@
cd to the project directory and do mvn install -->
../uimaj-bootstrap
+../uimaj-documentation
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1324556ae..d9096dbcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,12 +286,12 @@
jVinci/**
PearPackagingMavenPlugin/**
jcasgen-maven-plugin/**
- uima-doc-*/**
uimaj-adapter-*/**
uimaj-bom/**
uimaj-component-test-util/**
uimaj-core/**
uimaj-cpe/**
+ uimaj-documentation/**
uimaj-document-annotation/**
uimaj-eclipse-*/**
uimaj-maven-p2-site/**
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index bb5eaae6f..daa6770d4 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -252,6 +252,10 @@ under the License.
docs
644
755
+
+**/maint.*
+**/maint/**
+
diff --git a/uimaj-documentation/pom.xml b/uimaj-documentation/pom.xml
index 27949ab03..33b22321c 100644
--- a/uimaj-documentation/pom.xml
+++ b/uimaj-documentation/pom.xml
@@ -40,6 +40,7 @@
${asciidoctor.plugin.version}
${project.build.directory}/site/d
+ webfonts!
true
book
@@ -50,7 +51,7 @@
${project.version}
${project.version}
https://uima.apache.org
-font
+text
true
short
[uima-uimaj] 02/04: Issue #331: Convert remaining documentation to asciidoc
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/331-Convert-remaining-documentation-to-asciidoc
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 6839b7b2a84497ece062f8b9713db0d6e1a76ca0
Author: Richard Eckart de Castilho
AuthorDate: Fri Aug 4 18:24:35 2023 +0200
Issue #331: Convert remaining documentation to asciidoc
- Consolidate all documentation in the uimaj-documentation module
---
uima-doc-v3-maintainers-guide/pom.xml | 149 -
uima-doc-v3-users-guide/pom.xml| 145
uimaj-documentation/pom.xml| 60 +
.../src/docs/asciidoc/maint.adoc | 10 +-
.../src/docs/asciidoc/maint}/common_book_info.adoc | 0
.../src/docs/asciidoc/maint}/uv3.maven.adoc| 0
.../docs/asciidoc/maint}/uv3.one-time-setup.adoc | 0
.../asciidoc/maint}/uv3.project_structure.adoc | 0
.../src/docs/asciidoc/maint}/uv3.release.adoc | 2 +-
.../src/docs/asciidoc/tools/tools.jcasgen.adoc | 2 +-
.../src/docs/asciidoc/user.adoc| 24 ++--
.../src/docs/asciidoc/user}/common_book_info.adoc | 0
.../docs/asciidoc/user}/image-source/source.pptx | Bin
.../annotation-relations-definition.png| Bin
.../annotation-relations-table.png | Bin
.../annotation_predicates/annotation-relations.ods | Bin
.../custom_java_objects/5_steps.png| Bin
.../version_3_users_guide/migrate/multiples.png| Bin
.../select/select_big_pic.png | Bin
.../select/select_processing_actions.png | Bin
.../select/select_selection_and_ordering.png | Bin
.../select/select_source_type.png | Bin
.../select/select_terminal_form_actions.png| Bin
.../asciidoc/user}/uv3.annotation_predicates.adoc | 0
.../user}/uv3.backwards_compatibility.adoc | 0
.../asciidoc/user}/uv3.custom_java_objects.adoc| 0
.../src/docs/asciidoc/user}/uv3.logging.adoc | 0
.../src/docs/asciidoc/user}/uv3.migration.adoc | 0
.../docs/asciidoc/user}/uv3.migration.aids.adoc| 0
.../docs/asciidoc/user}/uv3.new_extended_apis.adoc | 0
.../src/docs/asciidoc/user}/uv3.overview.adoc | 0
.../src/docs/asciidoc/user}/uv3.pears.adoc | 0
.../src/docs/asciidoc/user}/uv3.performance.adoc | 0
.../src/docs/asciidoc/user}/uv3.select.adoc| 0
.../src/docs/asciidoc/user}/uv3.spi.adoc | 0
35 files changed, 79 insertions(+), 313 deletions(-)
diff --git a/uima-doc-v3-maintainers-guide/pom.xml
b/uima-doc-v3-maintainers-guide/pom.xml
deleted file mode 100644
index 5563443e2..0
--- a/uima-doc-v3-maintainers-guide/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
- 4.0.0
-
-
-org.apache.uima
-uimaj-parent
-3.5.0-SNAPSHOT
-../uimaj-parent/pom.xml
-
-
- uima-doc-v3-maintainers-guide
- pom
- Apache UIMA SDK Documentation - Version 3 Maintainer's Guide
- ${uimaWebsiteUrl}
-
-
-
-
-org.asciidoctor
-asciidoctor-maven-plugin
-${asciidoctor.plugin.version}
-
-
-user-guide-html
-generate-resources
-
- process-asciidoc
-
-
- html5
-
-left
-
-
-
-
-user-guide-pdf
-generate-resources
-
- process-asciidoc
-
-
- pdf
-
-preamble
-
-
-
-
-
-
version_3_maintainers_guide.adoc
- ${project.build.directory}/site/d
-
-book
-8
-true
-true
-${project.version}
-${project.version}
-Apache UIMA Version 3 Maintainer's
Guide
-https://uima.apache.org
-font
-true
-false
-true
-
-
-asciidoctor-pdf
-
-
-
-
-org.asciidoctor
-asciidoctorj
-${asciidoctor.version}
-
-
-org.asciidoctor
-asciidoctorj-pdf
-${asciidoctor.pdf.version}
-
-
-
-
-
-
-
- m2e
-
-
- m2e.version
-
-
-
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
-
[uima-uimaj] 01/01: Merge pull request #330 from apache/refactoring/325-Update-dependencies
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 ca44916d996280a23dd2ad8eb857199f4d7c196d Merge: e7ffd16a1 6e6f492b3 Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 20:02:28 2023 +0200 Merge pull request #330 from apache/refactoring/325-Update-dependencies Issue #325 - Update dependencies jcasgen-maven-plugin/pom.xml | 37 +++- .../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 13 +++-- uimaj-adapter-vinci/pom.xml| 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-ep-cas-editor-ide/pom.xml| 2 +- uimaj-ep-cas-editor/pom.xml| 2 +- uimaj-parent/pom.xml | 67 -- uimaj-test-util/pom.xml| 6 +- 9 files changed, 89 insertions(+), 44 deletions(-)
[uima-uimaj] branch refactoring/325-Update-dependencies deleted (was 6e6f492b3)
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 was 6e6f492b3 Issue #325: Update dependencies 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 (e7ffd16a1 -> ca44916d9)
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 e7ffd16a1 Merge pull request #329 from apache/feature/327-Provide-a-BOM add 5db3c81bb Issue #325: Update dependencies add 80da81348 Issue #325: Update dependencies add 6fa3050d4 Issue #325: Update dependencies add 6e6f492b3 Issue #325: Update dependencies new ca44916d9 Merge pull request #330 from apache/refactoring/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. Summary of changes: jcasgen-maven-plugin/pom.xml | 37 +++- .../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 13 +++-- uimaj-adapter-vinci/pom.xml| 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-ep-cas-editor-ide/pom.xml| 2 +- uimaj-ep-cas-editor/pom.xml| 2 +- uimaj-parent/pom.xml | 67 -- uimaj-test-util/pom.xml| 6 +- 9 files changed, 89 insertions(+), 44 deletions(-)
[uima-uimaj] branch refactoring/325-Update-dependencies updated (6fa3050d4 -> 6e6f492b3)
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 from 6fa3050d4 Issue #325: Update dependencies add 6e6f492b3 Issue #325: Update dependencies No new revisions were added by this update. Summary of changes: uimaj-parent/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[uima-parent-pom] branch refactoring/39-Upgrade-plugins deleted (was fae25dd)
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 fae25dd Issue #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 (c01cc38 -> cd9c36b)
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 c01cc38 Merge pull request #51 from apache/refactoring/50-Remove-outdated-website-distribution-config add fae25dd Issue #39: Upgrade plugins new cd9c36b Merge pull request #52 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 | 8 1 file changed, 8 insertions(+)
[uima-parent-pom] 01/01: Merge pull request #52 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 cd9c36b00362fd54157f35bb9aaca3b9c6d6ddc6 Merge: c01cc38 fae25dd Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 13:43:30 2023 +0200 Merge pull request #52 from apache/refactoring/39-Upgrade-plugins Issue #39: Upgrade plugins pom.xml | 8 1 file changed, 8 insertions(+)
[uima-parent-pom] branch refactoring/39-Upgrade-plugins created (now fae25dd)
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 fae25dd Issue #39: Upgrade plugins This branch includes the following new commits: new fae25dd Issue #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-parent-pom] 01/01: Issue #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 fae25ddeb328a593996c9772e45548f5f81360b0 Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 13:40:40 2023 +0200 Issue #39: Upgrade plugins - Add plugin dependency override back as it is still required --- pom.xml | 8 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 9a22c29..9e8e7f1 100644 --- a/pom.xml +++ b/pom.xml @@ -197,6 +197,14 @@ com.github.siom79.japicmp japicmp-maven-plugin 0.17.2 + + + + org.codehaus.groovy + groovy-jsr223 + 2.5.17 + +
[uima-uimaj] branch refactoring/325-Update-dependencies updated: 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
The following commit(s) were added to
refs/heads/refactoring/325-Update-dependencies by this push:
new 6fa3050d4 Issue #325: Update dependencies
6fa3050d4 is described below
commit 6fa3050d45ddc923bc8473ab711d57cbc8a5ca11
Author: Richard Eckart de Castilho
AuthorDate: Thu Aug 3 12:41:19 2023 +0200
Issue #325: Update dependencies
- Depend on junit-jupiter-api instead of junit-jupiter-engine for unit tests
---
uimaj-adapter-vinci/pom.xml | 2 +-
uimaj-component-test-util/pom.xml | 2 +-
uimaj-core/pom.xml| 2 +-
uimaj-ep-cas-editor-ide/pom.xml | 2 +-
uimaj-ep-cas-editor/pom.xml | 2 +-
uimaj-test-util/pom.xml | 6 ++
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml
index 7b1821869..07affc91d 100644
--- a/uimaj-adapter-vinci/pom.xml
+++ b/uimaj-adapter-vinci/pom.xml
@@ -55,7 +55,7 @@
org.junit.jupiter
- junit-jupiter-engine
+ junit-jupiter-api
test
diff --git a/uimaj-component-test-util/pom.xml
b/uimaj-component-test-util/pom.xml
index 3f810af76..948c74776 100644
--- a/uimaj-component-test-util/pom.xml
+++ b/uimaj-component-test-util/pom.xml
@@ -36,7 +36,7 @@
org.junit.jupiter
- junit-jupiter-engine
+ junit-jupiter-api
compile
diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
index 50058cd3d..b03592da9 100644
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@ -115,7 +115,7 @@
org.junit.jupiter
- junit-jupiter-engine
+ junit-jupiter-api
test
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index 51beea9b6..ae8d49ab4 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -113,7 +113,7 @@
org.junit.jupiter
- junit-jupiter-engine
+ junit-jupiter-api
test
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index 4a829f1b2..c2da7ed43 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -36,7 +36,7 @@
org.junit.jupiter
- junit-jupiter-engine
+ junit-jupiter-api
test
diff --git a/uimaj-test-util/pom.xml b/uimaj-test-util/pom.xml
index 0e1a9b1d7..1f8bf6250 100644
--- a/uimaj-test-util/pom.xml
+++ b/uimaj-test-util/pom.xml
@@ -40,7 +40,7 @@
org.junit.jupiter
- junit-jupiter-engine
+ junit-jupiter-api
compile
@@ -51,12 +51,10 @@
org.xmlunit
xmlunit-core
- ${xmlunit-version}
org.xmlunit
xmlunit-assertj3
- ${xmlunit-version}
-
\ No newline at end of file
+
[uima-uimaj] branch refactoring/325-Update-dependencies updated: 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 The following commit(s) were added to refs/heads/refactoring/325-Update-dependencies by this push: new 80da81348 Issue #325: Update dependencies 80da81348 is described below commit 80da813488c790cfa7d22046ca5b5dc1ebb294c1 Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 12:01:35 2023 +0200 Issue #325: Update dependencies - junit5 5.9.3 -> 5.10.0 - asciidoctor 2.5.8 -> 2.5.10 - asciidoctor-pdf 2.3.7 -> 2.3.9 - Removed redundant plugin dependency override --- uimaj-parent/pom.xml | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index 7e5f4688b..aaa3eeeae 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -144,7 +144,7 @@ 2.13.0 1.10.0 2.15.2 -5.9.3 +5.10.0 4.13.2 4.11.0 3.24.2 @@ -152,8 +152,8 @@ 3.2.5 2.2.4 -2.5.8 -2.3.7 +2.5.10 +2.3.9 1.8 1.8 @@ -341,15 +341,6 @@ - - - - -org.codehaus.groovy -groovy-jsr223 -2.5.17 - -
[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 5db3c81bb8a9ffef29230368fff9d7a76cf6ef0d
Author: Richard Eckart de Castilho
AuthorDate: Thu Aug 3 11:55:59 2023 +0200
Issue #325: Update dependencies
- junit4 -> 4.13.2 (needed for Maven plugin test harness...)
- maven-plugin-testing-harness 2.0 -> 3.3.0
- maven-plugin-tools-javadoc 2.9 -> 3.5.2
- maven-compat -> 3.2.5
---
jcasgen-maven-plugin/pom.xml | 37 ++---
.../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 13 --
uimaj-parent/pom.xml | 47 --
3 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml
index 8d8f6e69b..40f639908 100644
--- a/jcasgen-maven-plugin/pom.xml
+++ b/jcasgen-maven-plugin/pom.xml
@@ -16,7 +16,9 @@
specific language governing permissions and limitations
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.uima
@@ -24,17 +26,20 @@
3.5.0-SNAPSHOT
../uimaj-parent/pom.xml
-
-
+
+
jcasgen-maven-plugin
maven-plugin
Apache UIMA Maven: ${project.artifactId}
- A Maven Plugin for using JCasGen to generate Java classes from
XML type system descriptions
+ A Maven Plugin for using JCasGen to generate Java classes from
+XML type system descriptions
-3.0
+${maven.version}
@@ -84,23 +89,26 @@
org.sonatype.plexus
plexus-build-api
- 0.0.7
- org.junit.jupiter
- junit-jupiter-engine
+ junit
+ junit
test
- org.junit.vintage
- junit-vintage-engine
+ org.assertj
+ assertj-core
+ test
+
+
+ org.apache.maven
+ maven-compat
test
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.0
test
@@ -120,7 +128,7 @@
org.apache.maven.plugin-tools
maven-plugin-tools-javadoc
-2.9
+3.5.2
@@ -145,7 +153,8 @@
package
integration-test
-
classpath,multimodule,simple,!m2e
diff --git
a/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
b/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
index 7dce50176..8f99a76e0 100644
---
a/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
+++
b/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.uima.tools.jcasgen.maven;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +30,10 @@ import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Assert;
+import org.eclipse.aether.RepositorySystemSession;
import org.junit.Test;
public class JCasGenMojoTest extends AbstractMojoTestCase {
@@ -83,8 +86,10 @@ public class JCasGenMojoTest extends AbstractMojoTestCase {
assertTrue(pomFile.exists());
// create the MavenProject from the pom.xml file
+RepositorySystemSession session = MavenRepositorySystemUtils.newSession();
MavenExecutionRequest executionRequest = new
DefaultMavenExecutionRequest();
ProjectBuildingRequest buildingRequest =
executionRequest.getProjectBuildingRequest();
+buildingRequest.setRepositorySession(session);
ProjectBuilder projectBuilder = this.lookup(ProjectBuilder.class);
MavenProject project = projectBuilder.build(pomFile,
buildingRequest).getProject();
assertNotNull(project);
@@ -123,7 +128,7 @@ public class JCasGenMojoTest extends AbstractMojoTestCase {
// no _type files in v3
// File typeFile = new File(jCasGenDirectory + "/" + type.replace('.',
'/') + "_Type.java");
- Assert.ass
[uima-uimaj] branch refactoring/325-Update-dependencies created (now 5db3c81bb)
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 5db3c81bb Issue #325: Update dependencies This branch includes the following new commits: new 5db3c81bb 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-parent-pom] branch refactoring/50-Remove-outdated-website-distribution-config deleted (was 887db2d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/50-Remove-outdated-website-distribution-config in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git was 887db2d Issue #50: Remove outdated website distribution config 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 (129d13c -> c01cc38)
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 129d13c Merge pull request #49 from apache/bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested add 887db2d Issue #50: Remove outdated website distribution config new c01cc38 Merge pull request #51 from apache/refactoring/50-Remove-outdated-website-distribution-config 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 | 16 1 file changed, 16 deletions(-)
[uima-parent-pom] 01/01: Merge pull request #51 from apache/refactoring/50-Remove-outdated-website-distribution-config
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 c01cc38c5c9c7c8d1cd11ad4daeeb99a17c61e4d Merge: 129d13c 887db2d Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 11:46:49 2023 +0200 Merge pull request #51 from apache/refactoring/50-Remove-outdated-website-distribution-config Issue #50: Remove outdated website distribution config pom.xml | 16 1 file changed, 16 deletions(-)
[uima-parent-pom] branch refactoring/50-Remove-outdated-website-distribution-config created (now 887db2d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/50-Remove-outdated-website-distribution-config in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git at 887db2d Issue #50: Remove outdated website distribution config This branch includes the following new commits: new 887db2d Issue #50: Remove outdated website distribution config 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-parent-pom] 01/01: Issue #50: Remove outdated website distribution config
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/50-Remove-outdated-website-distribution-config
in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git
commit 887db2d779211138b7727284749958bd7cb67abb
Author: Richard Eckart de Castilho
AuthorDate: Thu Aug 3 11:43:26 2023 +0200
Issue #50: Remove outdated website distribution config
- Remove config
---
pom.xml | 16
1 file changed, 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07a42f6..9a22c29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,21 +90,6 @@
-
-
-
-
- uima.apache.org
- Apache UIMA Website
- ${uimaWebsiteDistributionUrl}
-
-
-
@@ -113,7 +98,6 @@
6
https://uima.apache.org
-
scp://people.apache.org/www/uima.apache.org/
yyMMdd_HHmm
${maven.build.timestamp}
[uima-parent-pom] branch bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested deleted (was af7127e)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git was af7127e Issue #48: Antrun executions for gpg should be skipped as well when skipping GPG is requested 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] 01/01: Merge pull request #49 from apache/bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested
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 129d13cb1db858cbec484e1a83b3ae26fcf4dcf3 Merge: 305cd6b af7127e Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 11:39:31 2023 +0200 Merge pull request #49 from apache/bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested Issue #48: Antrun executions for gpg should be skipped as well when skipping GPG is requested pom.xml | 3 +++ 1 file changed, 3 insertions(+)
[uima-parent-pom] branch main updated (305cd6b -> 129d13c)
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 305cd6b Merge pull request #47 from apache/refactoring/39-Upgrade-plugins add af7127e Issue #48: Antrun executions for gpg should be skipped as well when skipping GPG is requested new 129d13c Merge pull request #49 from apache/bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested 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 | 3 +++ 1 file changed, 3 insertions(+)
[uima-parent-pom] 01/01: Issue #48: Antrun executions for gpg should be skipped as well when skipping GPG is requested
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested
in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git
commit af7127e94a64cad81ffa18ac74f8a5fb2bff10e0
Author: Richard Eckart de Castilho
AuthorDate: Thu Aug 3 11:31:40 2023 +0200
Issue #48: Antrun executions for gpg should be skipped as well when
skipping GPG is requested
- Skip GPG antrun execution based on gpg.skip parameter
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index 1f2e043..07a42f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,8 @@
3.3.0
512m
+
+false
@@ -878,6 +880,7 @@
run
+ ${gpg.skip}
[uima-parent-pom] branch bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested created (now af7127e)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/48-Antrun-executions-for-gpg-should-be-skipped-as-well-when-skipping-GPG-is-requested in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git at af7127e Issue #48: Antrun executions for gpg should be skipped as well when skipping GPG is requested This branch includes the following new commits: new af7127e Issue #48: Antrun executions for gpg should be skipped as well when skipping GPG is requested 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-parent-pom] branch refactoring/39-Upgrade-plugins deleted (was 2ed5295)
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 2ed5295 Issue #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 (30e443b -> 305cd6b)
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 30e443b Merge pull request #46 from apache/refactoring/#39-Upgrade-plugins add c3a22ee Issue #39: Upgrade plugins add 3fab751 Merge branch 'main' into refactoring/39-Upgrade-plugins add 2ed5295 Issue #39: Upgrade plugins new 305cd6b Merge pull request #47 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 | 90 + 1 file changed, 40 insertions(+), 50 deletions(-)
[uima-parent-pom] 01/01: Merge pull request #47 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 305cd6bd467d7184c2f0da283095fe3f926874a8 Merge: 30e443b 2ed5295 Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 11:03:25 2023 +0200 Merge pull request #47 from apache/refactoring/39-Upgrade-plugins Issue #39: Upgrade plugins pom.xml | 90 + 1 file changed, 40 insertions(+), 50 deletions(-)
[uima-parent-pom] branch refactoring/39-Upgrade-plugins updated (3fab751 -> 2ed5295)
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 from 3fab751 Merge branch 'main' into refactoring/39-Upgrade-plugins add 2ed5295 Issue #39: Upgrade plugins No new revisions were added by this update. Summary of changes: pom.xml | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-)
[uima-uimaj] branch main updated (d2da8d6a9 -> e7ffd16a1)
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 d2da8d6a9 Merge pull request #328 from apache/feature/327-Provide-a-BOM add ec56bcb47 Issue #327: Provide a BOM new e7ffd16a1 Merge pull request #329 from apache/feature/327-Provide-a-BOM 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: aggregate-uimaj/pom.xml | 1 - pom.xml | 1 + uimaj-bom/pom.xml | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-)
[uima-uimaj] 01/01: Merge pull request #329 from apache/feature/327-Provide-a-BOM
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 e7ffd16a15020ea2df4b89cea7cdb2375cd1b4ac Merge: d2da8d6a9 ec56bcb47 Author: Richard Eckart de Castilho AuthorDate: Thu Aug 3 09:44:10 2023 +0200 Merge pull request #329 from apache/feature/327-Provide-a-BOM Issue #327: Provide a BOM aggregate-uimaj/pom.xml | 1 - pom.xml | 1 + uimaj-bom/pom.xml | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-)
[uima-uimaj] branch feature/327-Provide-a-BOM deleted (was ec56bcb47)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/327-Provide-a-BOM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git was ec56bcb47 Issue #327: Provide a BOM 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 feature/327-Provide-a-BOM updated (31ed91147 -> ec56bcb47)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/327-Provide-a-BOM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git omit 31ed91147 Issue #327: Provide a BOM add ec56bcb47 Issue #327: Provide a BOM 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 (31ed91147) \ N -- N -- N refs/heads/feature/327-Provide-a-BOM (ec56bcb47) 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: aggregate-uimaj/pom.xml | 1 - 1 file changed, 1 deletion(-)
[uima-uimaj] branch feature/327-Provide-a-BOM created (now 31ed91147)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/327-Provide-a-BOM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at 31ed91147 Issue #327: Provide a BOM This branch includes the following new commits: new 31ed91147 Issue #327: Provide a BOM 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 #327: Provide a BOM
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch feature/327-Provide-a-BOM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 31ed91147a43183e24c0bd2a9bf968683d6ff1ec Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 19:36:56 2023 +0200 Issue #327: Provide a BOM - BOM should not inherit from UIMAJ parent pom which does the internal dependency management --- pom.xml | 1 + uimaj-bom/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 83119c9f7..14a88d680 100644 --- a/pom.xml +++ b/pom.xml @@ -186,6 +186,7 @@ +uimaj-bom uimaj-parent aggregate-uimaj diff --git a/uimaj-bom/pom.xml b/uimaj-bom/pom.xml index dfdaf896c..1b3c1435a 100644 --- a/uimaj-bom/pom.xml +++ b/uimaj-bom/pom.xml @@ -24,9 +24,9 @@ org.apache.uima -uimaj-parent -3.5.0-SNAPSHOT -../uimaj-parent/pom.xml +parent-pom + +17-SNAPSHOT uimaj-bom
[uima-parent-pom] branch refactoring/39-Upgrade-plugins updated (c3a22ee -> 3fab751)
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 from c3a22ee Issue #39: Upgrade plugins add 30e443b Merge pull request #46 from apache/refactoring/#39-Upgrade-plugins add 3fab751 Merge branch 'main' into refactoring/39-Upgrade-plugins No new revisions were added by this update. Summary of changes:
[uima-parent-pom] branch main updated (5077356 -> 30e443b)
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 5077356 Merge pull request #45 from apache/refactoring/44-Remove-deprecated-profiles add 932848a Issue #39: Upgrade plugins new 30e443b Merge pull request #46 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 | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-)
[uima-parent-pom] 01/01: Issue #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 c3a22ee684c6b633404d015964dfc3fc4f07c15a
Author: Richard Eckart de Castilho
AuthorDate: Wed Aug 2 17:51:51 2023 +0200
Issue #39: Upgrade plugins
- maven-clean-plugin -> 3.3.1
- jacoco-maven-plugin 0.8.8 > 0.8.10
- maven-pmd-plugin 3.19.0 -> 3.21.0
- PearPackagingMavenPlugin 3.3.1 -> removed
- japicmp-maven-plugin 0.17.1 -> 0.17.2
- spotbugs-maven-plugin 4.7.3.0 -> 4.7.3.5
- maven-gpg-plugin 3.0.1 -> 3.1.0
- maven-dependency-plugin 3.4.0 -> 3.6.0
- maven-scm-plugin 1.13.0 -> 2.0.1
- maven-resources-plugin 3.3.0 -> 3.3.1
- maven-deploy-plugin 3.0.0 -> 3.1.1
- maven-source-plugin 3.2.1 -> 3.3.0
- maven-assembly-plugin 3.4.2 -> 3.6.0
- build-helper-maven-plugin 3.3.0 -> 3.4.0
- buildnumber-maven-plugin 3.0.0 -> 3.2.0
- maven-plugin-plugin 3.7.0 -> 3.9.0
- maven-compiler-plugin 3.10.1 -> 3.11.0
- maven-javadoc-plugin 3.4.1 -> 3.5.0
- maven-bundle-plugin 5.1.8 -> 5.1.9
- maven-eclipse-plugin 2.10 -> removed
---
pom.xml | 69 -
1 file changed, 25 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0998dd1..c0e4e88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,9 +129,6 @@
USletter
-
-
${project.build.directory}/pearPackaging
-
Portions of Apache UIMA were originally developed by
@@ -180,6 +177,12 @@
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+ 3.3.1
+
+
com.agilejava.docbkx
docbkx-maven-plugin
@@ -189,45 +192,31 @@
org.jacoco
jacoco-maven-plugin
- 0.8.8
+ 0.8.10
org.apache.maven.plugins
maven-pmd-plugin
- 3.19.0
-
-
-
- org.apache.uima
- PearPackagingMavenPlugin
- 3.3.1
+ 3.21.0
com.github.siom79.japicmp
japicmp-maven-plugin
- 0.17.1
-
-
-
- org.codehaus.groovy
- groovy-jsr223
- 2.5.20
-
-
+ 0.17.2
com.github.spotbugs
spotbugs-maven-plugin
- 4.7.3.0
+ 4.7.3.5
org.apache.maven.plugins
maven-gpg-plugin
- 3.0.1
+ 3.1.0
@@ -239,25 +228,25 @@
org.apache.maven.plugins
maven-dependency-plugin
- 3.4.0
+ 3.6.0
org.apache.maven.plugins
maven-scm-plugin
- 1.13.0
+ 2.0.1
org.apache.maven.plugins
maven-resources-plugin
- 3.3.0
+ 3.3.1
org.apache.maven.plugins
maven-deploy-plugin
- 3.0.0
+ 3.1.1
10
@@ -267,7 +256,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.0
@@ -287,7 +276,7 @@
warning message to use install instead -->
maven-assembly-plugin
- 3.4.2
+ 3.6.0
default-cli
@@ -303,18 +292,18 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.4.0
org.codehaus.mojo
buildnumber-maven-plugin
- 3.0.0
+ 3.2.0
org.apache.maven.plugins
maven-plugin-plugin
- 3.7.0
+ 3.9.0
@@ -345,13 +334,13 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.10.1
+ 3.11.0
org.apache.maven.plugins
maven-javadoc-plugin
- 3.4.1
+ 3.5.0
${maven.compiler.source}
@@ -451,7 +440,7 @@
org.apache.felix
maven-bundle-plugin
- 5.1.8
+ 5.1.9
true
@@ -538,13 +527,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.1.0
-
-
-
- org.apache.maven.plugins
- maven-eclipse-plugin
- 2.10
+ 3.3.0
@@ -695,7 +678,7 @@
-
[uima-parent-pom] branch refactoring/#39-Upgrade-plugins deleted (was 932848a)
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 932848a Issue #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] 01/01: Merge pull request #46 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 30e443bbd7945f3c9ca1ee5491de319625026ce3 Merge: 5077356 932848a Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 17:52:13 2023 +0200 Merge pull request #46 from apache/refactoring/#39-Upgrade-plugins Issue #39: Upgrade plugins pom.xml | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-)
[uima-parent-pom] branch refactoring/39-Upgrade-plugins created (now c3a22ee)
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 c3a22ee Issue #39: Upgrade plugins This branch includes the following new commits: new c3a22ee Issue #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-parent-pom] branch refactoring/#39-Upgrade-plugins created (now 932848a)
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 932848a Issue #39: Upgrade plugins This branch includes the following new commits: new 932848a Issue #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-parent-pom] 01/01: Issue #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 932848abc5652ed3ce9066237b44346c1e80d329 Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 17:20:13 2023 +0200 Issue #39: Upgrade plugins - maven-remote-resources-plugin 1.7.0 -> 3.1.0 --- pom.xml | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 3d2fec4..0998dd1 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ https://ci-builds.apache.org/ - + - 1.7.0 + 3.1.0 @@ -1390,7 +1389,7 @@ - + clear-META-INF @@ -1863,7 +1862,6 @@ - @@ -2068,7 +2066,7 @@ - +
[uima-parent-pom] branch refactoring/44-Remove-deprecated-profiles deleted (was eb36df9)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/44-Remove-deprecated-profiles in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git was eb36df9 Issue #44: Remove deprecated profiles 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] 01/01: Merge pull request #45 from apache/refactoring/44-Remove-deprecated-profiles
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 5077356cc6868b15dba0e6fe71202408c96160fb Merge: 53865f6 eb36df9 Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 17:17:20 2023 +0200 Merge pull request #45 from apache/refactoring/44-Remove-deprecated-profiles Issue #44: Remove deprecated profiles pom.xml | 961 1 file changed, 961 deletions(-)
[uima-parent-pom] branch main updated (53865f6 -> 5077356)
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 53865f6 Merge pull request #43 from apache/bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly add eb36df9 Issue #44: Remove deprecated profiles new 5077356 Merge pull request #45 from apache/refactoring/44-Remove-deprecated-profiles 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 | 961 1 file changed, 961 deletions(-)
[uima-parent-pom] 01/01: Issue #44: Remove deprecated profiles
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/44-Remove-deprecated-profiles
in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git
commit eb36df91b416a762facb1ccdd17f85615327c284
Author: Richard Eckart de Castilho
AuthorDate: Wed Aug 2 17:07:19 2023 +0200
Issue #44: Remove deprecated profiles
- Remove `build eclipse features`
- Remove `build-eclipse-update-subsite`
- Remove `build simple project binary assembly`
- Remove `build OSGi bundle for annotator`
- Remove `build standard PEAR
---
pom.xml | 961
1 file changed, 961 deletions(-)
diff --git a/pom.xml b/pom.xml
index 45397ab..3d2fec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -986,7 +986,6 @@
-
@@ -1067,11 +1066,9 @@
-
-
process-docbook
@@ -1292,7 +1289,6 @@
-
@@ -1366,7 +1362,6 @@
-
@@ -1489,700 +1484,6 @@
-
-
-
-
-
- build eclipse features
-
-
- marker-file-identifying-eclipse-feature
-
-
-
-
-
-
-${basedir}
-
- feature.properties
- feature.xml
- uima-eclipse-user-agreement.html
-
-true
-
-
-
-
-
-
-
-maven-resources-plugin
-
-
-filter feature.xml
-
-generate-resources
-
- copy-resources
-
-
- ${basedir}
-
-
- src/main/resources
-
-feature.xml
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- build-eclipse-update-subsite
-
-
- marker-file-identifying-eclipse-update-site
-
-
-
-${project.build.directory}/eus-work
-https://dist.apache.org/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-maven-resources-plugin
-
-
-filter-category.xml
-
-process-sources
-
- copy-resources
-
-
- ${basedir}
-
-
- src/main/resources
-
-category.xml
-
- true
-
-
-
-
-
-
-
-
-maven-antrun-plugin
-
-
-BuildUpdateSite-clearWorkAreas
-initialize
-
- run
-
-
-
-
-
-
-
-
-
-
BuildUpdateSite-pack-svnget-buildMetadata-commit-to-dev
-package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-checking out eclipse update subsite
${eclipseUpdateSiteComponent} from
- dist ...release
[uima-parent-pom] branch refactoring/44-Remove-deprecated-profiles created (now eb36df9)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/44-Remove-deprecated-profiles in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git at eb36df9 Issue #44: Remove deprecated profiles This branch includes the following new commits: new eb36df9 Issue #44: Remove deprecated profiles 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 main updated (82161ffa7 -> d2da8d6a9)
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 82161ffa7 Merge pull request #326 from apache/refactoring/325-Update-dependencies add eecf61683 Issue #327: Provide a BOM new d2da8d6a9 Merge pull request #328 from apache/feature/327-Provide-a-BOM 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: aggregate-uimaj/pom.xml | 1 + pom.xml | 1 + uimaj-bom/pom.xml | 81 + 3 files changed, 83 insertions(+) create mode 100644 uimaj-bom/pom.xml
[uima-uimaj] branch feature/327-Provide-a-BOM deleted (was eecf61683)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/327-Provide-a-BOM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git was eecf61683 Issue #327: Provide a BOM 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] 01/01: Merge pull request #328 from apache/feature/327-Provide-a-BOM
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 d2da8d6a98e6ffce7a387459aeff72cd3eefc1d1 Merge: 82161ffa7 eecf61683 Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 17:01:41 2023 +0200 Merge pull request #328 from apache/feature/327-Provide-a-BOM Issue #327: Provide a BOM aggregate-uimaj/pom.xml | 1 + pom.xml | 1 + uimaj-bom/pom.xml | 81 + 3 files changed, 83 insertions(+)
[uima-parent-pom] branch bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly deleted (was 3bd8bc4)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git was 3bd8bc4 Issue #42: Website on Maven Central search UI not shown properly 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 (9f67dc9 -> 53865f6)
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 9f67dc9 Merge pull request #41 from apache/refactoring/39-Upgrade-plugins add 3bd8bc4 Issue #42: Website on Maven Central search UI not shown properly new 53865f6 Merge pull request #43 from apache/bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-parent-pom] 01/01: Merge pull request #43 from apache/bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly
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 53865f6a9c70e10e90bdf8abc69f74c51303b68a Merge: 9f67dc9 3bd8bc4 Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 16:38:33 2023 +0200 Merge pull request #43 from apache/bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly Issue #42: Website on Maven Central search UI not shown properly pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-uimaj] branch feature/327-Provide-a-BOM created (now eecf61683)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/327-Provide-a-BOM in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git at eecf61683 Issue #327: Provide a BOM This branch includes the following new commits: new eecf61683 Issue #327: Provide a BOM 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 #327: Provide a BOM
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch feature/327-Provide-a-BOM
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit eecf61683905dd75df74e4f240002c21d167862a
Author: Richard Eckart de Castilho
AuthorDate: Wed Aug 2 14:41:14 2023 +0200
Issue #327: Provide a BOM
- Added the BOM
---
aggregate-uimaj/pom.xml | 1 +
pom.xml | 1 +
uimaj-bom/pom.xml | 81 +
3 files changed, 83 insertions(+)
diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml
index f09129c6a..caf2fb6e5 100644
--- a/aggregate-uimaj/pom.xml
+++ b/aggregate-uimaj/pom.xml
@@ -34,6 +34,7 @@
${uimaWebsiteUrl}
+../uimaj-bom
../uimaj-core
../uimaj-cpe
../uimaj-examples
diff --git a/pom.xml b/pom.xml
index dead16046..83119c9f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,6 +288,7 @@
uima-docbook-*/**
uima-doc-*/**
uimaj-adapter-*/**
+ uimaj-bom/**
uimaj-component-test-util/**
uimaj-core/**
uimaj-cpe/**
diff --git a/uimaj-bom/pom.xml b/uimaj-bom/pom.xml
new file mode 100644
index 0..dfdaf896c
--- /dev/null
+++ b/uimaj-bom/pom.xml
@@ -0,0 +1,81 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+
+org.apache.uima
+uimaj-parent
+3.5.0-SNAPSHOT
+../uimaj-parent/pom.xml
+
+
+ uimaj-bom
+ pom
+
+ Apache UIMA Base: ${project.artifactId}
+
+
+
+
+org.apache.uima
+uimaj-core
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+uimaj-cpe
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+uimaj-json
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+uimaj-adapter-vinci
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+jVinci
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+uimaj-test-util
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+uimaj-component-test-util
+3.5.0-SNAPSHOT
+
+
+org.apache.uima
+uimaj-document-annotation
+3.5.0-SNAPSHOT
+
+
+
+
\ No newline at end of file
[uima-uimaj] branch main updated (9c9b76a49 -> 82161ffa7)
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 9c9b76a49 Merge pull request #324 from apache/no-issue-merge-3.4.x add 5d71885db Issue #325: Update dependencies add be10c7900 Merge branch 'main' into refactoring/325-Update-dependencies new 82161ffa7 Merge pull request #326 from apache/refactoring/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. Summary of changes: 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| 4 ++-- 6 files changed, 20 insertions(+), 63 deletions(-)
[uima-uimaj] 01/01: Merge pull request #326 from apache/refactoring/325-Update-dependencies
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 82161ffa7ede11bd980710e0a991a389ae68848f Merge: 9c9b76a49 be10c7900 Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 13:57:52 2023 +0200 Merge pull request #326 from apache/refactoring/325-Update-dependencies Issue #325: Update dependencies 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| 4 ++-- 6 files changed, 20 insertions(+), 63 deletions(-)
[uima-uimaj] branch refactoring/325-Update-dependencies deleted (was be10c7900)
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 was be10c7900 Merge branch 'main' into refactoring/325-Update-dependencies 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 bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly created (now 3bd8bc4)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git at 3bd8bc4 Issue #42: Website on Maven Central search UI not shown properly This branch includes the following new commits: new 3bd8bc4 Issue #42: Website on Maven Central search UI not shown properly 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-parent-pom] 01/01: Issue #42: Website on Maven Central search UI not shown properly
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
bugfix/42-Website-on-Maven-Central-search-UI-not-shown-properly
in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git
commit 3bd8bc4e455a193c7b806a8e5c3d9b5f4ffbe7ae
Author: Richard Eckart de Castilho
AuthorDate: Wed Aug 2 12:44:49 2023 +0200
Issue #42: Website on Maven Central search UI not shown properly
- Do not use a property for the URL since Maven Central is unable to
dynamically resolve it
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 568d904..45397ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
This is the common UIMA parent pom. It contains the project-wide defaults.
- ${uimaWebsiteUrl}
+ https://uima.apache.org
2006
[uima-parent-pom] annotated tag parent-pom-16 deleted (was 133d1eb)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to annotated tag parent-pom-16 in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git *** WARNING: tag parent-pom-16 was deleted! *** tag was 133d1eb The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[uima-parent-pom] annotated tag rel/parent-pom-16 updated (dabd205 -> c027dd4)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to annotated tag rel/parent-pom-16 in repository https://gitbox.apache.org/repos/asf/uima-parent-pom.git *** WARNING: tag rel/parent-pom-16 was modified! *** from dabd205 (commit) to c027dd4 (tag) tagging dabd20580e28500bca5c99b30d79546e8de24bd6 (commit) replaces rel/parent-pom-15 by Richard Eckart de Castilho on Wed Aug 2 12:35:44 2023 +0200 - Log - --- No new revisions were added by this update. Summary of changes:
[uima-parent-pom] branch refactoring/39-Upgrade-plugins deleted (was 91ccc4b)
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 91ccc4b #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 (688e046 -> 9f67dc9)
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 688e046 Merge pull request #40 from apache/refactoring/39-Upgrade-plugins add 91ccc4b #39 - Upgrade plugins new 9f67dc9 Merge pull request #41 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
[uima-parent-pom] 01/01: Merge pull request #41 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 9f67dc999480bccee6af3e8e50eaa1e281c27de7 Merge: 688e046 91ccc4b Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 12:34:37 2023 +0200 Merge pull request #41 from apache/refactoring/39-Upgrade-plugins #39 - Upgrade plugins pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
[uima-build-jenkins-shared-library] branch main updated: Revert "Revert "Issue #5: Windows builds do not seem to work""
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-build-jenkins-shared-library.git
The following commit(s) were added to refs/heads/main by this push:
new d02e38a Revert "Revert "Issue #5: Windows builds do not seem to work""
d02e38a is described below
commit d02e38ab12495f1021eb89f40462407a10eec69e
Author: Richard Eckart de Castilho
AuthorDate: Wed Aug 2 11:58:54 2023 +0200
Revert "Revert "Issue #5: Windows builds do not seem to work""
This reverts commit bed2f579f062b9662f80fb1e52ecaeac1ddf2d05.
---
vars/defaultPipeline.groovy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/vars/defaultPipeline.groovy b/vars/defaultPipeline.groovy
index a423b55..0c5255a 100644
--- a/vars/defaultPipeline.groovy
+++ b/vars/defaultPipeline.groovy
@@ -63,7 +63,9 @@ def call(body) {
axes {
axis {
name 'PLATFORM'
-values 'ubuntu', 'Windows'
+// https://github.com/apache/uima-build-jenkins-shared-library/issues/5
+//values 'ubuntu', 'Windows'
+values 'ubuntu'
}
}
[uima-uimaj] branch refactoring/325-Update-dependencies updated (5d71885db -> be10c7900)
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 from 5d71885db Issue #325: Update dependencies add ddf5c533e Issue #319: SelectFSs_impl.close() creates stream just to close it add 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 add f26fa48ac Merge pull request #323 from apache/bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position add 74a7dff9e Merge branch 'release/3.4.x' into no-issue-merge-3.4.x add 9c9b76a49 Merge pull request #324 from apache/no-issue-merge-3.4.x add be10c7900 Merge branch 'main' into refactoring/325-Update-dependencies No new revisions were added by this update. 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 ++- .../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(-) create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pearTest.java
[uima-uimaj] 01/01: Merge pull request #324 from apache/no-issue-merge-3.4.x
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 9c9b76a4904687c8a9cd81fb0174b5415d955c61 Merge: 3a395185b 74a7dff9e Author: Richard Eckart de Castilho AuthorDate: Wed Aug 2 11:57:55 2023 +0200 Merge pull request #324 from apache/no-issue-merge-3.4.x No issue merge 3.4.x 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 main updated (3a395185b -> 9c9b76a49)
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 3a395185b Merge pull request #321 from apache/refactoring/no-issue-set-version add ddf5c533e Issue #319: SelectFSs_impl.close() creates stream just to close it add 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 add f26fa48ac Merge pull request #323 from apache/bugfix/320-Copy-of-FsIterator_set_sorted_pear-does-not-retain-position add 74a7dff9e Merge branch 'release/3.4.x' into no-issue-merge-3.4.x new 9c9b76a49 Merge pull request #324 from apache/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. 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 ++- .../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(-) create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pearTest.java
[uima-uimaj] branch no-issue-merge-3.4.x deleted (was 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 was 74a7dff9e Merge branch 'release/3.4.x' into no-issue-merge-3.4.x 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-build-jenkins-shared-library] branch main updated: Revert "Issue #5: Windows builds do not seem to work"
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-build-jenkins-shared-library.git
The following commit(s) were added to refs/heads/main by this push:
new bed2f57 Revert "Issue #5: Windows builds do not seem to work"
bed2f57 is described below
commit bed2f579f062b9662f80fb1e52ecaeac1ddf2d05
Author: Richard Eckart de Castilho
AuthorDate: Fri Jul 28 22:15:16 2023 +0200
Revert "Issue #5: Windows builds do not seem to work"
This reverts commit 895d88e3738aab2ab776194cf74f4e1cfe2e350f.
---
vars/defaultPipeline.groovy | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/vars/defaultPipeline.groovy b/vars/defaultPipeline.groovy
index 0c5255a..a423b55 100644
--- a/vars/defaultPipeline.groovy
+++ b/vars/defaultPipeline.groovy
@@ -63,9 +63,7 @@ def call(body) {
axes {
axis {
name 'PLATFORM'
-// https://github.com/apache/uima-build-jenkins-shared-library/issues/5
-//values 'ubuntu', 'Windows'
-values 'ubuntu'
+values 'ubuntu', 'Windows'
}
}
[uima-parent-pom] branch refactoring/39-Upgrade-plugins created (now 91ccc4b)
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 91ccc4b #39 - Upgrade plugins This branch includes the following new commits: new 91ccc4b #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-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 91ccc4be2c3ffe9ef8586b22a9c0114198703a24 Author: Richard Eckart de Castilho AuthorDate: Mon Jul 17 13:13:54 2023 +0200 #39 - Upgrade plugins - Minimum build-time Java version 11 -> 17 - tycho 3.0.5 -> 4.0.0 --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b02e0aa..568d904 100644 --- a/pom.xml +++ b/pom.xml @@ -150,8 +150,6 @@ 3.9.3 - - 17 3.3.0 @@ -2960,7 +2958,7 @@ -3.0.5 +4.0.0
[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.
