[UIMA-6341] Try out p2-layout-resolver
- Towards using only artifacts from the P2 sites via the p2-layout-resolver
diff --git a/example-projects/ruta-ep-example-extensions/pom.xml b/example-projects/ruta-ep-example-extensions/pom.xml
index f9bc69d..3415ca0 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>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>org.eclipse</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 800992c..e7edc62 100644
--- a/ruta-ep-addons/pom.xml
+++ b/ruta-ep-addons/pom.xml
@@ -80,63 +80,63 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
+ <artifactId>org.eclipse.ui</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.jobs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>ecore</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>ui</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.debug.ui</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
diff --git a/ruta-ep-caseditor/pom.xml b/ruta-ep-caseditor/pom.xml
index 9ca0438..b6af557 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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
+ <artifactId>org.eclipse.core.resources</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>[3.3.0,5.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.workbench</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>org.eclipse</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 b374ce2..7516b58 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>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>org.eclipse</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 54225d1..482f766 100644
--- a/ruta-ep-ide-ui/pom.xml
+++ b/ruta-ep-ide-ui/pom.xml
@@ -46,153 +46,121 @@
<dependencies>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.dltk.validators</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</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</groupId>
- <artifactId>debug</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.dltk</groupId>
- <artifactId>formatter</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>testing</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>[3.3.0,5.0.0)</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>search</artifactId>
+ <artifactId>org.eclipse.core.jobs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
+ <version>[3.3.0,5.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.search</artifactId>
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
+ <artifactId>org.eclipse.ui</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.ide</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>console</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.console</artifactId>
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
<version>[3.3.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>variables</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.variables</artifactId>
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
+ <version>[3.3.0,5.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>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.core</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>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.debug.ui</artifactId>
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
+ <groupId>org.eclipse</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 ba6d8ff..76e7ecf 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>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
<version>[3.3.0,6.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.resources</artifactId>
<version>[3.3.0,6.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.filesystem</artifactId>
<version>[1.0.0,6.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
+ <artifactId>org.eclipse.ui</artifactId>
<version>[3.3.0,6.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -97,14 +97,24 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.launching</artifactId>
<version>[3.3.0,6.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>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
<version>[3.3.0,6.0.0)</version>
<scope>provided</scope>
</dependency>
diff --git a/ruta-ep-parent/pom.xml b/ruta-ep-parent/pom.xml
index 1b041c8..89eb05f 100644
--- a/ruta-ep-parent/pom.xml
+++ b/ruta-ep-parent/pom.xml
@@ -56,68 +56,90 @@
</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>org.eclipse</id>
+ <url>http://download.eclipse.org/releases/oxygen/</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>org.eclipse.dltk</id>
+ <url>http://download.eclipse.org/technology/dltk/updates-dev/5.6/</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>
+ <artifactId>org.eclipse.dltk.core</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.dltk</groupId>
- <artifactId>ui</artifactId>
+ <artifactId>org.eclipse.dltk.ui</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.dltk</groupId>
- <artifactId>debug</artifactId>
+ <artifactId>org.eclipse.dltk.debug</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.dltk</groupId>
- <artifactId>annotations</artifactId>
+ <artifactId>org.eclipse.dltk.annotations</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.dltk</groupId>
- <artifactId>launching</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.dltk.core</groupId>
- <artifactId>manipulation</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.dltk.validators</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.eclipse.dltk.launching</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.dltk</groupId>
- <artifactId>console</artifactId>
+ <artifactId>org.eclipse.dltk.core.manipulation</artifactId>
<version>${dltk.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86_64</artifactId>
+ <groupId>org.eclipse.dltk</groupId>
+ <artifactId>org.eclipse.dltk.validators.core</artifactId>
+ <version>${dltk.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.dltk</groupId>
+ <artifactId>org.eclipse.dltk.console</artifactId>
+ <version>${dltk.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.dltk</groupId>
+ <artifactId>org.eclipse.dltk.formatter</artifactId>
+ <version>${dltk.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.dltk</groupId>
+ <artifactId>org.eclipse.dltk.testing</artifactId>
+ <version>${dltk.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
@@ -127,119 +149,121 @@
<!-- explicit dependencies for mars.1 -->
<dependencies>
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
- <version>3.5.0</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.contenttype</artifactId>
+ <version>[3.5.0,4.0.0)</version>
</dependency>
+ <!--
<dependency>
- <groupId>org.eclipse.e4.core</groupId>
- <artifactId>commands</artifactId>
+ <groupId>org.eclipse</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>org.eclipse</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>org.eclipse</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>org.eclipse</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>org.eclipse</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>org.eclipse</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>org.eclipse</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>org.eclipse</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>org.eclipse</groupId>
+ <artifactId>org.eclipse.e4.ui.css.swt</artifactId>
<version>0.12.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.css.swt</groupId>
- <artifactId>theme</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.e4.ui.css.swt.theme</artifactId>
<version>0.10.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.model</groupId>
- <artifactId>workbench</artifactId>
- <version>1.1.100</version>
+ <groupId>org.eclipse</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>
- <artifactId>swt</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
<version>0.13.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.e4.ui.workbench.addons</groupId>
- <artifactId>swt</artifactId>
- <version>1.2.0</version>
+ <groupId>org.eclipse</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>org.eclipse</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>org.eclipse</groupId>
+ <artifactId>org.eclipse.e4.ui.widgets</artifactId>
+ <version>[1.1.0,2.0.0)</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore</artifactId>
+ <version>[2.11.1,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>ecore</artifactId>
- <version>2.11.1</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore.change</artifactId>
+ <version>[2.11.0,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>change</artifactId>
- <version>2.11.0</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
+ <version>[2.11.1,3.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.emf.ecore</groupId>
- <artifactId>xmi</artifactId>
- <version>2.11.1</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
+ <version>[1.3.300,2.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <version>1.3.300</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.common</artifactId>
+ <version>[3.7.0,4.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <version>3.7.0</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.preferences</artifactId>
+ <version>[3.5.300,4.0.0)</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <version>3.5.300</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
- <version>3.7.0</version>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.core.jobs</artifactId>
+ <version>[3.7.0,4.0.0)</version>
</dependency>
<dependency>
<groupId>org.w3c.css</groupId>
@@ -255,6 +279,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>
@@ -265,5 +298,4 @@
</plugins>
</pluginManagement>
</build>
-
</project>
diff --git a/ruta-ep-textruler/pom.xml b/ruta-ep-textruler/pom.xml
index f27f558..39a5ba5 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>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.app</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>[3.3.0,5.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.editors</artifactId>
+ <version>[3.3.0,5.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
<version>[3.3.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.dltk</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.dltk.validators</groupId>
- <artifactId>ui</artifactId>
- <version>${dltk.version}</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>org.eclipse</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 31cb4b3..a0892f7 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -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>
