You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2021/03/17 15:42:13 UTC
[uima-ruta] branch feature/UIMA-6341-Try-out-p2-layout-resolver-v2
created (now 8bdd112)
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch feature/UIMA-6341-Try-out-p2-layout-resolver-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.
at 8bdd112 [UIMA-6341] Try out p2-layout-resolver
This branch includes the following new commits:
new 8bdd112 [UIMA-6341] Try out p2-layout-resolver
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: [UIMA-6341] Try out p2-layout-resolver
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch feature/UIMA-6341-Try-out-p2-layout-resolver-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 8bdd11245c1b0bccdfe6bf3156315521a770ef25
Author: Peter Klügl <pe...@averbis.com>
AuthorDate: Wed Mar 17 16:41:52 2021 +0100
[UIMA-6341] Try out p2-layout-resolver
- update versions
---
.../ruta-ep-example-extensions/pom.xml | 8 +-
ruta-ep-addons/pom.xml | 56 +++---
ruta-ep-caseditor/pom.xml | 52 ++---
ruta-ep-core-ext/pom.xml | 8 +-
ruta-ep-ide-ui/pom.xml | 171 ++++++++---------
ruta-ep-ide/pom.xml | 62 +++---
ruta-ep-parent/pom.xml | 210 +++++++++++++--------
ruta-ep-textruler/pom.xml | 44 ++---
ruta-parent/pom.xml | 18 +-
9 files changed, 322 insertions(+), 307 deletions(-)
diff --git a/example-projects/ruta-ep-example-extensions/pom.xml b/example-projects/ruta-ep-example-extensions/pom.xml
index 608a279..5c488cc 100644
--- a/example-projects/ruta-ep-example-extensions/pom.xml
+++ b/example-projects/ruta-ep-example-extensions/pom.xml
@@ -64,13 +64,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/ruta-ep-addons/pom.xml b/ruta-ep-addons/pom.xml
index 6c801a4..a96032f 100644
--- a/ruta-ep-addons/pom.xml
+++ b/ruta-ep-addons/pom.xml
@@ -80,64 +80,64 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>[3.111.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
+ <version>[3.14.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>[3.13.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>[3.11.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.jobs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>ecore</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>[3.15.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>ui</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.debug.ui</artifactId>
+ <version>[3.1.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/ruta-ep-caseditor/pom.xml b/ruta-ep-caseditor/pom.xml
index 110b862..f2309c0 100644
--- a/ruta-ep-caseditor/pom.xml
+++ b/ruta-ep-caseditor/pom.xml
@@ -49,56 +49,56 @@
<version>${uimaVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
+ <version>[3.15.100,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>[3.13.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>[3.111.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
+ <version>[3.14.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
+ <version>[3.9.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>[3.11.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.workbench</artifactId>
+ <version>[3.112.100,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>[3.15.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/ruta-ep-core-ext/pom.xml b/ruta-ep-core-ext/pom.xml
index 5e5064e..ff9f0d0 100644
--- a/ruta-ep-core-ext/pom.xml
+++ b/ruta-ep-core-ext/pom.xml
@@ -77,13 +77,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/ruta-ep-ide-ui/pom.xml b/ruta-ep-ide-ui/pom.xml
index 28f0b5a..0de71f8 100644
--- a/ruta-ep-ide-ui/pom.xml
+++ b/ruta-ep-ide-ui/pom.xml
@@ -46,153 +46,138 @@
<dependencies>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
+ <version>[3.15.100,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.validators</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.jobs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.console</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>[3.13.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>debug</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.search</artifactId>
+ <version>[3.11.400,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.debug</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>[3.111.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>formatter</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
+ <version>[3.14.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>testing</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
+ <version>[3.9.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.console</artifactId>
+ <version>[3.8.300,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>[3.11.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>[3.15.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>search</artifactId>
- <version>[3.2.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.variables</artifactId>
+ <version>[3.4.300,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>[3.12.0,4.0.0)</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with this one and tries to download it with
+ "tools" as the classifier.
+ -->
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>[3.16.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.debug.ui</artifactId>
+ <version>[3.10.100,4.0.0)</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with the "icu-data" classifier
+ -->
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>com.ibm.icu</artifactId>
+ </exclusion>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with this one and tries to download it with
+ "tools" as the classifier.
+ -->
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>console</artifactId>
- <version>[3.2.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>[3.3.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>variables</artifactId>
- <version>[3.2.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- <version>[3.3.0,5.0.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>[3.3.0,5.0.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.debug</groupId>
- <artifactId>ui</artifactId>
- <version>[3.2.0,5.0.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.filesystem</artifactId>
<version>[1.0.0,3.0.0)</version>
<scope>provided</scope>
</dependency>
diff --git a/ruta-ep-ide/pom.xml b/ruta-ep-ide/pom.xml
index 922085a..f7e0401 100644
--- a/ruta-ep-ide/pom.xml
+++ b/ruta-ep-ide/pom.xml
@@ -47,47 +47,47 @@
<dependencies>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>[3.3.0,6.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
+ <version>[3.15.100,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>[3.3.0,6.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>[3.13.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- <version>[1.0.0,6.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.filesystem</artifactId>
+ <version>[1.7.200,2.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>[3.3.0,6.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>[3.111.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -97,15 +97,25 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- <version>[3.3.0,6.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>[3.12.0,4.0.0)</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with this one and tries to download it with
+ "tools" as the classifier.
+ -->
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>[3.3.0,6.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>[3.16.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/ruta-ep-parent/pom.xml b/ruta-ep-parent/pom.xml
index 3138d9f..dc084e0 100644
--- a/ruta-ep-parent/pom.xml
+++ b/ruta-ep-parent/pom.xml
@@ -52,128 +52,166 @@
</scm>
<properties>
- <dltk.version>[3.0.1,6.0.0)</dltk.version>
+ <eclipseP2RepoId>org.eclipse.p2.201812</eclipseP2RepoId>
+ <eclipseP2RepoUrl>http://download.eclipse.org/releases/2018-12/</eclipseP2RepoUrl>
+ <dltk.version>[5.11.0,6.0.0)</dltk.version>
</properties>
<repositories>
- <!-- Temporary repository that contains osgi bundles like DLTK 5.3. Added to ease building the UIMA
- Ruta
- Eclipse plugins that depend on bundles, which are not provided by public maven repositories. -->
<repository>
- <id>averbis-osgi-releases</id>
- <url>https://maven.averbis.com/m2/</url>
+ <id>${eclipseP2RepoId}</id>
+ <url>${eclipseP2RepoUrl}</url>
+ <layout>p2</layout>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>artifactory.openntf.org</id>
+ <name>artifactory.openntf.org</name>
+ <url>https://artifactory.openntf.org/openntf</url>
+ </pluginRepository>
+ </pluginRepositories>
<dependencies>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>core</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.core</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>ui</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.ui</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with the "icu-data" classifier
+ -->
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>com.ibm.icu</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>debug</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.debug</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>annotations</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.annotations</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>launching</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.launching</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <!--
+ The p2 resolver appears to have trouble with the "icu-data" classifier
+ -->
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>com.ibm.icu</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.core</groupId>
- <artifactId>manipulation</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.core.manipulation</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.validators</groupId>
- <artifactId>core</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.validators.core</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>console</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.console</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86_64</artifactId>
- <version>[3.2.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.formatter</artifactId>
+ <version>${dltk.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.dltk.testing</artifactId>
+ <version>${dltk.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
+ <version>[3.109.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencyManagement>
- <!-- explicit dependencies for mars.1 -->
+ <!-- explicit dependencies for 2018/12 -->
<dependencies>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
- <version>3.5.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
+ <version>[3.7.200,4.0.0)</version>
</dependency>
+ <!--
<dependency>
- <groupId>org.eclipse.e4.core</groupId>
- <artifactId>commands</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.core.commands</artifactId>
<version>0.11.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.core</groupId>
- <artifactId>di</artifactId>
- <version>1.5.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.core.di</artifactId>
+ <version>[1.5.0,2.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.core</groupId>
- <artifactId>services</artifactId>
- <version>2.0.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.core.services</artifactId>
+ <version>[2.0.0,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.bindings</artifactId>
<version>0.11.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui</groupId>
- <artifactId>di</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.di</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui</groupId>
- <artifactId>workbench</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.workbench</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui</groupId>
- <artifactId>workbench3</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.workbench3</artifactId>
<version>0.13.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.css</groupId>
- <artifactId>core</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.css.core</artifactId>
<version>0.11.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.css</groupId>
- <artifactId>swt</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.css.swt</artifactId>
<version>0.12.0</version>
</dependency>
<dependency>
@@ -182,9 +220,9 @@
<version>0.10.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.model</groupId>
- <artifactId>workbench</artifactId>
- <version>1.1.100</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.model.workbench</artifactId>
+ <version>[1.1.100,2.0.0)</version>
</dependency>
<dependency>
<groupId>org.eclipse.e4.ui.workbench</groupId>
@@ -192,54 +230,55 @@
<version>0.13.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.workbench.addons</groupId>
- <artifactId>swt</artifactId>
- <version>1.2.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId>
+ <version>[1.2.0,2.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.workbench.renderers</groupId>
- <artifactId>swt</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId>
<version>0.13.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui</groupId>
- <artifactId>widgets</artifactId>
- <version>1.1.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.e4.ui.widgets</artifactId>
+ <version>[1.1.0,2.0.0)</version>
</dependency>
+ -->
<dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>ecore</artifactId>
- <version>2.11.1</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore</artifactId>
+ <version>[2.16.0,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>change</artifactId>
- <version>2.11.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.change</artifactId>
+ <version>[2.13.0,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
- <version>2.11.1</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
+ <version>[2.15.0,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <version>1.3.300</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
+ <version>[1.4.0,2.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <version>3.7.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.common</artifactId>
+ <version>[3.10.200,4.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <version>3.5.300</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
+ <version>[3.7.200,4.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
- <version>3.7.0</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.core.jobs</artifactId>
+ <version>[3.10.200,4.0.0)</version>
</dependency>
<dependency>
<groupId>org.w3c.css</groupId>
@@ -255,6 +294,15 @@
</dependencyManagement>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.openntf.maven</groupId>
+ <artifactId>p2-layout-resolver</artifactId>
+ <version>1.2.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+
<pluginManagement>
<plugins>
<plugin>
diff --git a/ruta-ep-textruler/pom.xml b/ruta-ep-textruler/pom.xml
index d6abc24..3be7315 100644
--- a/ruta-ep-textruler/pom.xml
+++ b/ruta-ep-textruler/pom.xml
@@ -62,49 +62,37 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>[3.15.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>[3.3.0.0,5.0.0)</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>[3.11.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.editors</artifactId>
+ <version>[3.11.300,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.validators</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
+ <version>[3.9.200,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk.console</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.dltk.debug</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index a0634ac..ff4c852 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>14</version>
<relativePath />
</parent>
@@ -58,22 +58,6 @@
the
build tooling. This allows maven to find the snapshots when looking for the parent of this pom -->
<repositories>
- <repository>
- <id>eclipsePlugins</id>
- <name>Eclipse components</name>
- <layout>default</layout>
- <url>https://repo1.maven.org/eclipse</url>
-
- <releases>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
-
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
<!-- modify central repository access: Turn on checksum checking -->
<repository>
<id>central</id>