[NO JIRA] Fix build of Eclipse plugins
- Comment EP aggregate back in
- Fix dependencies
- Clean up POMs a bit
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
index 168ed14..cae011b 100644
--- a/aggregate-uima-as/pom.xml
+++ b/aggregate-uima-as/pom.xml
@@ -64,7 +64,7 @@
<module>../uimaj-as-activemq</module>
<module>../uimaj-as-core</module>
<module>../uimaj-as-jms</module>
- <!--module>../aggregate-uima-as-eclipse-plugins</module-->
+ <module>../aggregate-uima-as-eclipse-plugins</module>
<module>../uima-as-docbooks</module>
</modules>
</project>
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index 13d3e14..0703bc1 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!--
+<!--
This pom serves as the the UIMA-AS common parent pom, and may include
overrides to the project-wide parent-pom. Over time, things in this pom which
apply to other projects within UIMA are migrated to the project-wide parent
- pom.
+ pom.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -69,14 +69,14 @@
<url>https://repo1.maven.org/maven2</url>
<releases>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>false</enabled>
</snapshots>
- </repository -->
+ </repository -->
<!-- modify central repository access: Turn on checksum checking -->
<repository>
@@ -106,14 +106,6 @@
<enabled>false</enabled>
</releases>
</repository>
-
- <!--repository>
- <id>${eclipseP2RepoId}</id>
- <url>${eclipseP2RepoUrl}</url>
- <layout>p2</layout>
- </repository-->
-
-
</repositories>
<pluginRepositories>
@@ -137,9 +129,8 @@
<uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
-
- <!--eclipseP2RepoId>org.eclipse.p2.201812</eclipseP2RepoId>
- <eclipseP2RepoUrl>http://download.eclipse.org/releases/2018-12/</eclipseP2RepoUrl-->
+ <eclipseP2RepoId>org.eclipse.p2.201812</eclipseP2RepoId>
+ <eclipseP2RepoUrl>http://download.eclipse.org/releases/2018-12/</eclipseP2RepoUrl>
<!-- level of uimaj sdk this release depends on -->
<uimajDependencyVersion>2.10.3</uimajDependencyVersion>
@@ -163,11 +154,11 @@
<hawtbuff.version>1.11</hawtbuff.version>
<junit.version>4.8.1</junit.version>
- <!--
- Configuring settings is best done through default properties that multiple plugins.
- Local configurations within plugins should be avoided. Where plugins do not pick up default
- properties already, they should be injected manually into the plugins.
- -->
+ <!--
+ Configuring settings is best done through default properties that multiple plugins.
+ Local configurations within plugins should be avoided. Where plugins do not pick up default
+ properties already, they should be injected manually into the plugins.
+ -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -175,11 +166,14 @@
<!-- Needed for NOTICE file packaged in each jar under META-INF -->
<uimaASNoticeText>
Portions of UIMA-AS were originally developed by
- International Business Machines Corporation and are
+ International Business
+ Machines Corporation and are
licensed to the Apache Software Foundation under the
- "Software Grant License Agreement", informally known as the
+ "Software
+ Grant License Agreement", informally known as the
"IBM UIMA-EE License Agreement".
- Copyright (c) 2007, 2008 IBM Corporation
+ Copyright (c)
+ 2007, 2008 IBM Corporation
</uimaASNoticeText>
<!-- Needed for NOTICE file packaged in each jar under META-INF -->
@@ -486,20 +480,48 @@
<version>${junit.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jdt.debug</artifactId>
+ <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>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
-
<plugins>
<plugin>
+ <groupId>org.openntf.maven</groupId>
+ <artifactId>p2-layout-resolver</artifactId>
+ <version>1.3.0</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence
on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -566,4 +588,24 @@
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>marker-file-identifying-eclipse-plugin</id>
+ <activation>
+ <file>
+ <exists>marker-file-identifying-eclipse-plugin</exists>
+ </file>
+ </activation>
+
+ <repositories>
+ <repository>
+ <id>${eclipseP2RepoId}</id>
+ <url>${eclipseP2RepoUrl}</url>
+ <layout>p2</layout>
+ </repository>
+
+ </repositories>
+ </profile>
+ </profiles>
+
</project>
diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml
index 4309684..f21efea 100644
--- a/uimaj-ep-deployeditor/pom.xml
+++ b/uimaj-ep-deployeditor/pom.xml
@@ -88,319 +88,31 @@
<scope>provided</scope>
</dependency>
- <!-- Eclipse dependencies -->
-
- <!-- Some of these are probably not needed.
- If you take out too many, the bundle plugin
- doesn't include enough of the core.runtime,
- that is, it generates a sub-import of the form
- org.eclipse.core.runtime;common=split
- which breaks things.
- -->
-
- <!-- core
+ <!-- Eclipse dependencies -->
<dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.resources</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
--->
- <!-- next one causes NPE with maven 2.0.7.
- Might be related to http://jira.codehaus.org/browse/MNG-3086
- Workaround - change version from 3.2.0 to 3.2.1 as of 2/2008 is OK -->
-<!-- <dependency>
- <groupId>org.eclipse.ui</groupId>
+ <groupId>${eclipseP2RepoId}</groupId>
<artifactId>org.eclipse.ui</artifactId>
- <version>[3.3.0.0,4.0.0]</version>
+ <version>[3.108.1, 4.0.0)</version>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.editors</artifactId>
- <version>[3.2.0,4.0.0]</version>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ <version>[3.13.0, 4.0.0)</version>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.forms</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.launching</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
+ <groupId>${eclipseP2RepoId}</groupId>
<artifactId>org.eclipse.jdt.ui</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
-
- <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>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>org.eclipse.jface.text</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.pde</groupId>
- <artifactId>org.eclipse.pde.ui</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
-
- <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>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.ui.intro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.ant.ui</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </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>
- <version>[3.2.1,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.jobs</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.contenttype</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.preferences</artifactId>
- <version>[3.2.1,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>[3.2.1,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.filesystem</artifactId>
- <version>[1.0.0,4.0.0]</version>
+ <version>[3.12.0, 4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.common</artifactId>
- <version>[3.2.0,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ant</groupId>
- <artifactId>org.eclipse.ant.core</artifactId>
- <version>[3.1.100,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.expressions</artifactId>
- <version>[3.2.1,4.0.0]</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.variables</artifactId>
- <version>[3.1.100,4.0.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>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.swt</artifactId>
- </exclusion>
- <!-- https://issues.apache.org/jira/browse/UIMA-6267 -->
- <exclusion>
- <groupId>com.sun.jna</groupId>
- <artifactId>com.sun.jna</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jna</groupId>
- <artifactId>com.sun.jna.platform</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+ <groupId>${eclipseP2RepoId}</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
<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>
- <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>
- <!-- https://issues.apache.org/jira/browse/UIMA-6267 -->
- <exclusion>
- <groupId>com.sun.jna</groupId>
- <artifactId>com.sun.jna</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jna</groupId>
- <artifactId>com.sun.jna.platform</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
- <version>[1.0.0,1.0.1)</version>
- -->
- <version>[1.2.0,2.0.0)</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -408,7 +120,6 @@
<plugins>
<plugin>
-
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
diff --git a/uimaj-ep-runtime-deployeditor/pom.xml b/uimaj-ep-runtime-deployeditor/pom.xml
index 6c01e3d..ef68e0f 100644
--- a/uimaj-ep-runtime-deployeditor/pom.xml
+++ b/uimaj-ep-runtime-deployeditor/pom.xml
@@ -95,7 +95,7 @@
<version>[1.6.1,2.0.0)</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>${eclipseP2RepoId}</groupId>
<artifactId>org.eclipse.core.resources</artifactId>
<version>[3.11.1,4.0.0)</version>
@@ -131,14 +131,6 @@
<version>[3.2.0,5.0.0)</version>
<scope>provided</scope>
</dependency>
-
-
-
-
-
-
-
-
</dependencies>
<build>
