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
commit 5cc8c7cae2d097413f33b43d6e91036b3a3ff453 Author: Marshall Schor <m...@schor.com> AuthorDate: Tue Jan 7 17:57:28 2020 -0500 [UIMA-6164] update several POMs for eclipse plugins so they build using the maven central eclipse artifacts More work needs to be done: removing redundant updates, changing the repository refs to delete now-broken (404 not found) refs --- uimaj-ep-cas-editor/pom.xml | 105 ++++++++++++++++++++++++++----- uimaj-ep-configurator/pom.xml | 139 ++++++++++++++++++++++++++++++++++++++--- uimaj-ep-debug/pom.xml | 9 ++- uimaj-ep-jcasgen/pom.xml | 13 +++- uimaj-ep-launcher/pom.xml | 68 +++++++++++++++++--- uimaj-ep-pear-packager/pom.xml | 78 ++++++++++++++++++++--- 6 files changed, 365 insertions(+), 47 deletions(-) diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml index f66de21..d954346 100644 --- a/uimaj-ep-cas-editor/pom.xml +++ b/uimaj-ep-cas-editor/pom.xml @@ -85,6 +85,7 @@ </dependency> <!-- Eclipse dependencies --> + <!-- <dependency> <groupId>org.eclipse.core</groupId> <artifactId>runtime</artifactId> @@ -99,14 +100,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> + <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> @@ -114,49 +153,83 @@ 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,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.platform</groupId> + <artifactId>org.eclipse.core.filesystem</artifactId> + <version>[1.6.1,2.0.0)</version> + </dependency> + + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.core.resources</artifactId> + <version>[3.11.1,4.0.0)</version> + </dependency> + + <dependency> - <groupId>org.eclipse.ui</groupId> - <artifactId>views</artifactId> + <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> + <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> + <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> + <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> - + <!-- <dependency> <groupId>org.eclipse.jdt</groupId> <artifactId>launching</artifactId> <version>[3.3.0,6.0.0)</version> <scope>provided</scope> </dependency> - + --> <!-- https://issues.apache.org/jira/browse/UIMA-3510 --> <dependency> <groupId>org.eclipse.equinox</groupId> diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml index 75fd889..2e338cb 100644 --- a/uimaj-ep-configurator/pom.xml +++ b/uimaj-ep-configurator/pom.xml @@ -110,6 +110,7 @@ in as comments --> + <!-- core --> <!--dependency> <groupId>org.eclipse.core</groupId> @@ -180,14 +181,79 @@ <version>3.2.0</version> <scope>provided</scope> </dependency--> + + <!-- + <dependency> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.ui</artifactId> - <version>3.2.0</version> + <version>[3.20.0,4.0.0)</version> + <exclusions> + <! - - + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.ui</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.jface</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.jface.text</artifactId> + </exclusion> + + - - > + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.ui.workbench</artifactId> + </exclusion> + + <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.swt.gtk.linux.aarch64</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.swt.gtk.linux.arm</artifactId> + </exclusion> + </exclusions> + <scope>provided</scope> </dependency> + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId> + <version>[3.113.0, 4.0.0)</version> + + <exclusions> + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.swt</artifactId> + </exclusion> + </exclusions> + + </dependency> + --> <!-- misc --> <!--dependency> <groupId>org.eclipse.jface</groupId> @@ -201,19 +267,78 @@ <artifactId>org.eclipse.pde.ui</artifactId> <version>3.2.0</version> <scope>provided</scope> - </dependency--> + </dependency - <dependency> + + --> + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.ui</artifactId> + <version>[3.108.1, 4.0.0)</version> + <exclusions> + <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> - <version>3.2.0</version> + <version>[3.2.0,5.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> + </dependency> + + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>org.eclipse.jdt.ui</artifactId> + <version>[3.12.0,4.0.0)</version> + <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> <!-- These next dependencies are just to lock down the transitive dependencies of the above. This was done because on Sept 7 2010 somebody uploaded corrupted versions of these to maven central. --> + + + <!-- <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> @@ -223,7 +348,7 @@ <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.registry</artifactId> - <version>3.2.1</version> + <version>[3.2.1,4.0.0)</version> <scope>provided</scope> </dependency> <dependency> @@ -286,7 +411,7 @@ <version>3.1.100</version> <scope>provided</scope> </dependency> - + --> </dependencies> <build> diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml index 605dc52..d5aec52 100644 --- a/uimaj-ep-debug/pom.xml +++ b/uimaj-ep-debug/pom.xml @@ -94,7 +94,7 @@ UIMA data structures to the Eclipse Debug displays</description> <dependency> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.debug.ui</artifactId> - <version>3.2.0</version> + <version>[3.8.0, 4.0.0)</version> <scope>provided</scope> <!-- https://issues.apache.org/jira/browse/UIMA-5252 --> @@ -103,10 +103,12 @@ UIMA data structures to the Eclipse Debug displays</description> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.swt</artifactId> </exclusion> + <!-- <exclusion> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.ui.workbench</artifactId> - </exclusion> + </exclusion> + --> <exclusion> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.search</artifactId> @@ -118,7 +120,7 @@ UIMA data structures to the Eclipse Debug displays</description> </exclusions> </dependency> - <!-- dependencies added to overcome 3.6 maven central corrupted upload --> + <!-- dependencies added to overcome 3.6 maven central corrupted upload <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.filesystem</artifactId> @@ -191,6 +193,7 @@ UIMA data structures to the Eclipse Debug displays</description> <version>3.2.0</version> <scope>provided</scope> </dependency> + --> </dependencies> <build> diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml index e8def62..8c02837 100644 --- a/uimaj-ep-jcasgen/pom.xml +++ b/uimaj-ep-jcasgen/pom.xml @@ -86,16 +86,24 @@ </dependency> <!-- Eclipse dependencies --> + <!-- <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> <version>3.2.0</version> <scope>provided</scope> </dependency> + --> <dependency> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core</artifactId> - <version>3.2.0</version> + <version>[3.12.0, 4.0.0)</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.team</groupId> + <artifactId>org.eclipse.team.core</artifactId> + </exclusion> + </exclusions> <scope>provided</scope> </dependency> <dependency> @@ -116,6 +124,7 @@ transitive dependencies of the above. This was done because on Sept 7 2010 somebody uploaded corrupted versions of these to maven central. --> + <!-- <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.registry</artifactId> @@ -182,7 +191,7 @@ <version>3.1.100</version> <scope>provided</scope> </dependency> - + --> </dependencies> diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml index ce26ac5..f8157e6 100644 --- a/uimaj-ep-launcher/pom.xml +++ b/uimaj-ep-launcher/pom.xml @@ -96,24 +96,28 @@ 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,5.0.0)</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.eclipse.jdt</groupId> - <artifactId>org.eclipse.jdt.debug.ui</artifactId> - <version>3.2.0</version> - <scope>provided</scope> - <!-- https://issues.apache.org/jira/browse/UIMA-5252 --> + + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>org.eclipse.jdt.debug.ui</artifactId> + <version>[3.8.0, 4.0.0)</version> + <scope>provided</scope> + + <!-- https://issues.apache.org/jira/browse/UIMA-5252 --> <exclusions> <exclusion> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.swt</artifactId> </exclusion> + <!-- <exclusion> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.ui.workbench</artifactId> </exclusion> + --> <exclusion> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.search</artifactId> @@ -121,12 +125,55 @@ <exclusion> <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.ui.ide</artifactId> - </exclusion> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.jface</artifactId> + <version>[3.16.0, 4.0.0)</version> + </dependency> + + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>org.eclipse.jdt.ui</artifactId> + <version>[3.12.0,4.0.0)</version> + <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> <!-- dependencies added to overcome 3.6 maven central corrupted upload --> + <!-- <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.filesystem</artifactId> @@ -204,7 +251,8 @@ <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId> <version>3.2.0</version> <scope>provided</scope> - </dependency> + </dependency> + --> </dependencies> <build> diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml index 851bb78..f938271 100644 --- a/uimaj-ep-pear-packager/pom.xml +++ b/uimaj-ep-pear-packager/pom.xml @@ -82,7 +82,7 @@ <scope>compile</scope> </dependency> - <!-- Eclipse dependencies --> + <!-- Eclipse dependencies <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.resources</artifactId> @@ -96,19 +96,77 @@ <version>3.2.0</version> <scope>provided</scope> </dependency> - + --> <dependency> <groupId>org.eclipse.jdt</groupId> <artifactId>org.eclipse.jdt.core</artifactId> - <version>3.2.0</version> + <version>[3.12.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> + </dependency> + + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>org.eclipse.jdt.ui</artifactId> + <version>[3.12.0,4.0.0)</version> + <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.ui</groupId> <artifactId>org.eclipse.ui.ide</artifactId> <version>3.2.0</version> <scope>provided</scope> </dependency> + --> + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.ui</artifactId> + <version>[3.108.1, 4.0.0)</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.swt</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- next one causes NPE with maven 2.0.7. Might be related to https://jira.codehaus.org/browse/MNG-3086 --> <!--dependency> <groupId>org.eclipse.ui</groupId> @@ -118,18 +176,19 @@ <!-- the need for this one may go away when the ui dependency can be included --> - <dependency> + + <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.win32.win32.x86</artifactId> - <version>3.2.0</version> + <version>[3.2.0,5.0.0)</version> <scope>provided</scope> - </dependency> - + </dependency> + <!-- These next dependencies are just to lock down the transitive dependencies of the above. This was done because on Sept 7 2010 somebody uploaded corrupted versions of these to maven central. --> - + <!-- <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.registry</artifactId> @@ -195,7 +254,8 @@ <artifactId>org.eclipse.core.variables</artifactId> <version>3.1.100</version> <scope>provided</scope> - </dependency> + </dependency> + --> </dependencies> <build>