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 1e3977d [UIMA-6164] add more excludes and insure scope provide is
present for eclipse plugins
1e3977d is described below
commit 1e3977db0ec687fde8b0fb5d88c27223edd7445a
Author: Marshall Schor <m...@schor.com>
AuthorDate: Wed Jan 8 13:56:30 2020 -0500
[UIMA-6164] add more excludes and insure scope provide is present for
eclipse plugins
---
uimaj-ep-cas-editor-ide/pom.xml | 13 +++++++++++-
uimaj-ep-cas-editor/pom.xml | 21 +++++++++++++++++++
uimaj-ep-configurator/pom.xml | 19 ++++++++++++++---
uimaj-ep-debug/pom.xml | 10 +++++++++
uimaj-ep-jcasgen/pom.xml | 45 +++++++++++++++++++++++++++++------------
uimaj-ep-launcher/pom.xml | 12 +++++++++++
uimaj-ep-pear-packager/pom.xml | 13 ++++++++++++
7 files changed, 116 insertions(+), 17 deletions(-)
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index 298673c..480ea20 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -169,6 +169,16 @@
</exclusions>
</dependency>
+
+ <!-- This updated version requires -Dosgi.platform=win32.win32.x86_64 be
set
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
+ <version>[3.105.3,4.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
@@ -176,9 +186,10 @@
was 3.3.0
because only 3.2.0 and 3.2.1 are in
repo -->
- <version>[3.2.0.0,5.0.0)</version>
+ <version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
+
<!--
<dependency>
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index 984f143..efd07a2 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -75,6 +75,17 @@
<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 +93,13 @@
<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>
<!-- Eclipse dependencies -->
@@ -113,6 +131,7 @@
<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>
@@ -168,12 +187,14 @@
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.filesystem</artifactId>
<version>[1.6.1,2.0.0)</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.resources</artifactId>
<version>[3.11.1,4.0.0)</version>
+ <scope>provided</scope>
</dependency>
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index 86c6a9f..2b3d13b 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -81,16 +81,29 @@
<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>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
<version>${project.parent.version}</version>
- <!-- must be provided to get pax:eclipse to work, but
- must be compile to get eclipse:eclipse to include
- them as Referenced Libraries -->
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-cpe</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml
index d5aec52..85f798f 100644
--- a/uimaj-ep-debug/pom.xml
+++ b/uimaj-ep-debug/pom.xml
@@ -80,6 +80,16 @@ UIMA data structures to the Eclipse Debug
displays</description>
<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>
<!-- next dependency is commented out due to Maven 2.0.7 throwing NPE
diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
index 8c02837..c734493 100644
--- a/uimaj-ep-jcasgen/pom.xml
+++ b/uimaj-ep-jcasgen/pom.xml
@@ -71,19 +71,35 @@
<scope>compile</scope>
</dependency-->
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <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>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-tools</artifactId>
- <version>${project.parent.version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <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>
<!-- Eclipse dependencies -->
<!--
@@ -105,7 +121,8 @@
</exclusion>
</exclusions>
<scope>provided</scope>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
@@ -113,10 +130,12 @@
<version>2.1.0</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>common</artifactId>
<version>2.1.0</version>
+ <scope>provided</scope>
</dependency>
diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml
index f8157e6..1087186 100644
--- a/uimaj-ep-launcher/pom.xml
+++ b/uimaj-ep-launcher/pom.xml
@@ -79,6 +79,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>
<!-- next dependency is commented out due to Maven 2.0.7 throwing NPE
@@ -133,12 +143,14 @@
<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.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>
diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml
index f938271..25769ce 100644
--- a/uimaj-ep-pear-packager/pom.xml
+++ b/uimaj-ep-pear-packager/pom.xml
@@ -80,6 +80,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>
<!-- Eclipse dependencies
@@ -108,6 +118,7 @@
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.jface</artifactId>
<version>[3.16.0, 4.0.0)</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -145,6 +156,7 @@
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<!--
@@ -165,6 +177,7 @@
<artifactId>org.eclipse.swt</artifactId>
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<!-- next one causes NPE with maven 2.0.7. Might be related to
https://jira.codehaus.org/browse/MNG-3086 -->
