This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch UIMA-6164_update_eclipse_plugin_dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to
refs/heads/UIMA-6164_update_eclipse_plugin_dependencies by this push:
new 3d943f3 [UIMA-6164] fix case-editor-ide, add missing provided-scope
3d943f3 is described below
commit 3d943f30cc62b4898441a39ee44a8e78bb6d53b0
Author: Marshall Schor <m...@schor.com>
AuthorDate: Wed Jan 8 11:01:19 2020 -0500
[UIMA-6164] fix case-editor-ide, add missing provided-scope
---
uimaj-ep-cas-editor-ide/pom.xml | 139 ++++++++++++++++++++++++++++++++--------
uimaj-ep-cas-editor/pom.xml | 3 +-
uimaj-ep-configurator/pom.xml | 1 +
3 files changed, 117 insertions(+), 26 deletions(-)
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index 9b13ed2..298673c 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -75,6 +75,16 @@
<artifactId>uimaj-core</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bitbucket.mstrobel</groupId>
+ <artifactId>procyon-compilertools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bitbucket.mstrobel</groupId>
+ <artifactId>procyon-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -82,6 +92,12 @@
<artifactId>uimaj-tools</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-cpe</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -92,6 +108,7 @@
</dependency>
<!-- Eclipse dependencies -->
+ <!--
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
@@ -106,14 +123,52 @@
<scope>provided</scope>
</dependency>
- <!-- Depending on org.eclipse.ui does not include the SWT
dependency -->
+ <! - - Depending on org.eclipse.ui does not include the SWT
dependency - - >
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>ui</artifactId>
<version>[3.3.0.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
-
+ -->
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.ui</artifactId>
+ <version>[3.12.0,4.0.0)</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.search</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.debug.ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.compare</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.team</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.team.ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ </exclusion>
+
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
@@ -121,51 +176,85 @@
was 3.3.0
because only 3.2.0 and 3.2.1 are in
repo -->
- <version>[3.2.0.0,4.0.0)</version>
+ <version>[3.2.0.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.eclipse.ui</groupId>
<artifactId>ide</artifactId>
<version>[3.3.0.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
+ -->
+
+
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.ui.views</artifactId>
<!-- changing the lower version number to 3.2.0,
was 3.3.0
because only 3.2.0 and 3.2.1 are in
repo -->
- <version>[3.2.0.0,4.0.0)</version>
- <scope>provided</scope>
- </dependency>
+ <version>[3.9.0,4.0.0)</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>[3.3.0.0,4.0.0)</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+ <version>[3.10.0,4.0.0)</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>[3.3.0.0,4.0.0)</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ <version>[3.16.0, 4.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface.text</artifactId>
+ <version>[3.11.0,4.0.0)</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
<!-- https://issues.apache.org/jira/browse/UIMA-3510 -->
+ <!--
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>app</artifactId>
- <!-- https://issues.apache.org/jira/browse/UIMA-3695
+ <! - - https://issues.apache.org/jira/browse/UIMA-3695
<version>[1.0.0,1.0.1)</version>
- -->
+ - - >
<version>[1.2.0,2.0.0)</version>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
+ -->
</dependencies>
<build>
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index d954346..984f143 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -109,7 +109,7 @@
</dependency>
-->
- <dependency>
+ <dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.ui</artifactId>
<version>[3.12.0,4.0.0)</version>
@@ -238,6 +238,7 @@
<version>[1.0.0,1.0.1)</version>
-->
<version>[1.2.0,2.0.0)</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index 2e338cb..86c6a9f 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -294,6 +294,7 @@
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.jface</artifactId>
<version>[3.16.0, 4.0.0)</version>
+ <scope>provided</scope>
</dependency>
<dependency>
