(uima-ruta) 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 93f9854736257993b64823211bbabe27627235ff Author: Richard Eckart de Castilho AuthorDate: Fri Dec 15 14:47:09 2023 +0100 Issue #133: Update dependencies - junit 5.10.0 -> 5.10.1 - commons-text 1.10.0 -> 1.11.0 - commons-lang3 3.13.0 -> 3.14.0 - commons-io 2.13.0 -> 2.15.1 - commons-logging 1.1.1 -> 1.3.0 - caffeine 3.1.7 -> 3.1.8 --- ruta-parent/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml index 5b4b0d5b..2d0732c6 100644 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@ -126,7 +126,7 @@ 1.7.36 3.8.1 -5.10.0 +5.10.1 4.13.2 3.24.2 @@ -134,13 +134,13 @@ 1.6 3.2.2 4.4 -1.10.0 -3.13.0 -2.13.0 +1.11.0 +3.14.0 +2.15.1 3.6.1 -1.1.1 +1.3.0 1.1 -3.1.7 +3.1.8 [5.11.0,6.0.0)
(uima-ruta) 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies-2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit bae5174cc0ed940fcbbeee4c7ef8dd3525c0c429 Author: Richard Eckart de Castilho AuthorDate: Wed Nov 15 16:25:02 2023 +0100 Issue #133: Update dependencies - uimafit 3.4.0 -> 3.5.0 - fix Eclipse p2 repository (2023-12 has not yet been released) --- ruta-parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml index 2ed288c8..327e0d8e 100644 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@ -67,7 +67,7 @@ ${eclipseP2RepoId} - https://download.eclipse.org/releases/2023-12/ + https://download.eclipse.org/releases/2022-09/ p2 @@ -118,7 +118,7 @@ 3.5.0 -3.4.0 +3.5.0 5.3.30 1.7.36 3.8.1 @@ -150,7 +150,7 @@ 17 JavaSE-17 -org.eclipse.p2.202312 +org.eclipse.p2.202209 org.eclipse.p2.201812 3.3.0
(uima-ruta) 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies-2 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 47349567ce0b1583e81ba7b88399f398fbd80c7b Author: Richard Eckart de Castilho AuthorDate: Wed Nov 15 15:06:32 2023 +0100 Issue #133: Update dependencies - uimaj 3.5.0-SNAPSHOT -> 3.5.0 --- ruta-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml index d9c2de02..2ed288c8 100644 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@ -117,7 +117,7 @@ Creative Commons Attribution 3.0 License. -3.5.0-SNAPSHOT +3.5.0 3.4.0 5.3.30 1.7.36
(uima-ruta) 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 56913431a5b94fb1bda4381016ece2b415be73ce Author: Richard Eckart de Castilho AuthorDate: Wed Nov 1 09:45:13 2023 +0100 Issue #133: Update dependencies - Switch to Eclipse 2022-09 baseline - Tycho -> 4.0.3 --- ruta-parent/pom.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml index d9c2de02..b425e925 100644 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@ -67,7 +67,7 @@ ${eclipseP2RepoId} - https://download.eclipse.org/releases/2023-12/ + https://download.eclipse.org/releases/2022-09/ p2 @@ -117,6 +117,8 @@ Creative Commons Attribution 3.0 License. +4.0.3 + 3.5.0-SNAPSHOT 3.4.0 5.3.30 @@ -150,7 +152,7 @@ 17 JavaSE-17 -org.eclipse.p2.202312 +org.eclipse.p2.202209 org.eclipse.p2.201812 3.3.0
[uima-ruta] 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 1a3d2e4fbc5968140b83d718b21a88435d7097ef Author: Richard Eckart de Castilho AuthorDate: Thu Oct 5 14:13:53 2023 +0200 Issue #133: Update dependencies - Switch to Eclipse 2023-09 baseline - Force dependency on DLTK 5.11.0 - Add Eclipse 2018-12 update site as a reference repository to the Ruta feature so users can get DLTK 5.11.0 which is no longer included in recent Eclipse releases - Replace some uses of deprecated API --- ruta-eclipse-feature/feature.xml | 2 +- ruta-eclipse-update-site/category.xml | 3 +- .../ui/launchConfiguration/RutaCommonTab.java | 4 +-- .../RutaSmartTypingConfigurationBlock.java | 33 ++ ruta-ep-parent/pom.xml | 22 +++ ruta-parent/pom.xml| 8 +- 6 files changed, 44 insertions(+), 28 deletions(-) diff --git a/ruta-eclipse-feature/feature.xml b/ruta-eclipse-feature/feature.xml index cb636366..5a8caf36 100644 --- a/ruta-eclipse-feature/feature.xml +++ b/ruta-eclipse-feature/feature.xml @@ -150,7 +150,7 @@ Apache UIMA is a trademark of the Apache Software Foundation in the United State - + - - ${eclipseP2RepoId} + ${dltkP2RepoId} com.ibm.icu - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.debug ${dltk.version} provided - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.annotations ${dltk.version} provided - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.launching ${dltk.version} provided @@ -99,31 +99,31 @@ - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.core.manipulation ${dltk.version} provided - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.validators.core ${dltk.version} provided - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.console ${dltk.version} provided - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.formatter ${dltk.version} provided - ${eclipseP2RepoId} + ${dltkP2RepoId} org.eclipse.dltk.testing ${dltk.version} provided diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml index acb052a3..dd0a4532 100644 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@ -67,6 +67,11 @@ ${eclipseP2RepoId} + https://download.eclipse.org/releases/2023-12/ + p2 + + + ${dltkP2RepoId} https://download.eclipse.org/releases/2018-12/ p2 @@ -145,7 +150,8 @@ 17 JavaSE-17 -org.eclipse.p2.201812 +org.eclipse.p2.202312 +org.eclipse.p2.201812 3.3.0
[uima-ruta] 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit cd61cf8a89fff7757a60521a5b8d96d3a1a0ce2f Author: Richard Eckart de Castilho AuthorDate: Fri Aug 11 11:33:19 2023 +0200 Issue #133: Update dependencies - maven-plugin-tools-javadoc 2.9 -> 3.5.2 - Remove Maven Central repo override which is already present in the Apache UIMA Parent POM --- ruta-maven-plugin/pom.xml | 2 +- ruta-parent/pom.xml | 18 -- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/ruta-maven-plugin/pom.xml b/ruta-maven-plugin/pom.xml index ff8bb3fe..794720c1 100644 --- a/ruta-maven-plugin/pom.xml +++ b/ruta-maven-plugin/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugin-tools maven-plugin-tools-javadoc -2.9 +3.5.2 diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml index bf106573..26092144 100644 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@ -48,24 +48,6 @@ - - - central - Maven Repository Switchboard - default - https://repo1.maven.org/maven2 - - -true -fail -never - - - -false - - -
[uima-ruta] 01/01: Issue #133: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/133-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 1ce3c42f2313d9ece435103fe1711d64fe7767f4 Author: Richard Eckart de Castilho AuthorDate: Wed Aug 9 13:47:00 2023 +0200 Issue #133: Update dependencies - Set required Java version to 17 - Set execution environment in OSGI bundles to JavaSE-17 - uima-uimaj 3.4.0 -> 3.5.0-SNAPSHOT - dltk 3.0.0 -> 5.11.0 - maven -> 3.2.5 - maven-plugin-testing-harness 2.0 -> 3.3.0 - plexus-utils -> removed - caffeine 2.9.3 -> 3.1.7 --- .../ruta-ep-example-extensions/pom.xml | 2 +- pom.xml| 6 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 6 +- ruta-eclipse-feature/feature.xml | 4 +- ruta-eclipse-feature/pom.xml | 44 - ruta-ep-addons/pom.xml | 12 +- 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 | 33 ruta-ep-textruler/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 34 ++-- .../ruta/maven/RutaGenerateDescriptorMojo.java | 14 +- .../ruta/maven/RutaGenerateDescriptorMojoTest.java | 4 + ruta-parent/pom.xml| 177 + 18 files changed, 210 insertions(+), 141 deletions(-) diff --git a/example-projects/ruta-ep-example-extensions/pom.xml b/example-projects/ruta-ep-example-extensions/pom.xml index 54cee2df..3ffd091c 100644 --- a/example-projects/ruta-ep-example-extensions/pom.xml +++ b/example-projects/ruta-ep-example-extensions/pom.xml @@ -125,7 +125,7 @@ org.apache.uima.ruta.example.extensions;singleton:=true - JavaSE-1.8 + ${execution.environment} lazy true diff --git a/pom.xml b/pom.xml index 28e1157e..d21f620d 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,9 @@ ruta-core ruta-core-ext +ruta-maven-plugin +ruta-maven-archetype + ruta-ep-parent ruta-ep-engine ruta-ep-ide @@ -112,9 +115,6 @@ ruta-eclipse-feature ruta-eclipse-update-site -ruta-maven-plugin -ruta-maven-archetype - ruta-docbook example-projects/ruta-ep-example-extensions diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml index acfaec9c..7f2de7a3 100644 --- a/ruta-core/pom.xml +++ b/ruta-core/pom.xml @@ -231,9 +231,8 @@ org.apache.felix maven-bundle-plugin - - JavaSE-1.8 + ${execution.environment} <_dsannotations>* <_metatypeannotations>* -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;> +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 @@ -41,6 +43,46 @@ + + org.apache.uima + uimaj-ep-runtime + ${uimaVersion} + + + org.apache.uima + uimaj-ep-jcasgen + ${uimaVersion} + + + org.apache.uima + uimaj-ep-debug + ${uimaVersion} + + + org.apache.uima + uimaj-ep-configurator + ${uimaVersion} + + + org.apache.uima + uimaj-ep-cas-editor + ${uimaVersion} + + + org.apache.uima + uimaj-ep-cas-editor-ide + ${uimaVersion} + + + org.apache.uima + uimaj-ep-pear-packager + ${uimaVersion} + + + org.apache.uima + uimaj-ep-launcher + ${uimaVersion} + org.apache.uima ruta-ep-addons diff --git a/ruta-ep-addons/pom.xml b/ruta-ep-addons/pom.xml index 198e5f9d..5d26f6b8 100644 --- a/ruta-ep-addons/pom.xml +++ b/ruta-ep-addons/pom.xml @@ -77,6 +77,12 @@ ruta-ep-ide-ui ${project.parent.version} + + org.apache.commons + commons-lang3 + + + ${eclipseP2RepoId} org.eclipse.equinox.app @@ -138,10 +144,6 @@ [3.1.200,4.0.0) provided - - org.apache.commons - commons-lang3 - @@ -190,7 +192,7 @@ org.apache.uima.ruta.addons;singleton:=true