You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/03/17 13:35:49 UTC

[uima-uimaj] branch feature/UIMA-6341-Try-out-p2-layout-resolver created (now 57ad58e)

This is an automated email from the ASF dual-hosted git repository.

rec pushed a change to branch feature/UIMA-6341-Try-out-p2-layout-resolver
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


      at 57ad58e  [UIMA-6341] Try out p2-layout-resolver

This branch includes the following new commits:

     new 57ad58e  [UIMA-6341] Try out p2-layout-resolver

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[uima-uimaj] 01/01: [UIMA-6341] Try out p2-layout-resolver

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch feature/UIMA-6341-Try-out-p2-layout-resolver
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 57ad58e637d4110353a73a30160e0ddba6d7ec35
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Mar 17 14:35:35 2021 +0100

    [UIMA-6341] Try out p2-layout-resolver
    
    - Switch dependencies from Maven Central to p2
---
 uimaj-ep-cas-editor-ide/pom.xml | 334 +++++++++++-------------------------
 uimaj-ep-cas-editor/pom.xml     | 359 ++++++++++++---------------------------
 uimaj-ep-configurator/pom.xml   | 318 +---------------------------------
 uimaj-ep-debug/pom.xml          | 237 ++++++--------------------
 uimaj-ep-jcasgen/pom.xml        | 229 ++++++++-----------------
 uimaj-ep-launcher/pom.xml       | 359 +++++++++++----------------------------
 uimaj-ep-pear-packager/pom.xml  | 367 ++++++++++++----------------------------
 uimaj-parent/pom.xml            |  67 +++++++-
 8 files changed, 606 insertions(+), 1664 deletions(-)

diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index 5161f31..e0621c1 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -1,24 +1,26 @@
 <?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
-
-     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.    
+  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
+
+  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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.uima</groupId>
@@ -26,21 +28,21 @@
     <version>3.2.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
-  
-	<artifactId>uimaj-ep-cas-editor-ide</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache UIMA Eclipse: ${project.artifactId}</name>
+
+  <artifactId>uimaj-ep-cas-editor-ide</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache UIMA Eclipse: ${project.artifactId}</name>
   <description>Allows editing the contents of a saved CAS</description>
   <url>${uimaWebsiteUrl}</url>
-  
+
   <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that computes the connection elements
-       from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
+    even though the <scm> element that follows is exactly the
+    same as those in super poms, it cannot be inherited because
+    there is some special code that computes the connection elements
+    from the chain of parent poms, if this is omitted.
+
+    Keeping this a bit factored allows cutting/pasting the <scm>
+    element, and just changing the following two properties -->
   <scm>
     <connection>
       scm:git:https://github.com/apache/uima-uimaj/uimaj-ep-cas-editor-ide
@@ -53,28 +55,28 @@
     </url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
   </properties>
-  		
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
-		</dependency>
+    </dependency>
 
-		<!-- UIMA dependencies -->
-		<!--
-			don't depend on the runtime plugin, instead, depend on the parts
-			needed
-		-->
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-core</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>compile</scope>
+    <!-- UIMA dependencies -->
+    <!--
+      don't depend on the runtime plugin, instead, depend on the parts
+      needed
+    -->
+    <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>
@@ -85,216 +87,70 @@
           <artifactId>procyon-core</artifactId>
         </exclusion>
       </exclusions>
-		</dependency>
+    </dependency>
 
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-tools</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>compile</scope>
+    <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>
-		
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-ep-cas-editor</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<!-- Eclipse dependencies -->
-    <!-- 
-		<dependency>
-			<groupId>org.eclipse.core</groupId>
-			<artifactId>runtime</artifactId>
-			<version>[3.3.0.0,4.0.0)</version>
-			<scope>provided</scope>
-		</dependency>
+    </dependency>
 
-		<dependency>
-			<groupId>org.eclipse.core</groupId>
-			<artifactId>resources</artifactId>
-			<version>[3.3.0.0,4.0.0)</version>
-			<scope>provided</scope>
-		</dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-cas-editor</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>compile</scope>
+    </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>
-    -->
-    
+    <!-- Eclipse dependencies -->
     <dependency>
-      <groupId>org.eclipse.jdt</groupId>
+      <groupId>${eclipseP2RepoId}</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>
-    
-    <!--  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>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+      <version>[3.2.0,5.0.0)</version>
       <scope>provided</scope>
     </dependency>
-    -->
-
-		<dependency>
-			<groupId>org.eclipse.swt</groupId>
-			<artifactId>org.eclipse.swt.win32.win32.x86</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,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>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</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.9.0,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.platform</groupId>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</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>
-         <!-- 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.platform</groupId>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.jface</artifactId>
-      <version>[3.16.0, 4.0.0)</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-      <groupId>org.eclipse.platform</groupId>
+      <version>[3.13.0, 4.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</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
-          <version>[1.0.0,1.0.1)</version>
-       - - >
-       <version>[1.2.0,2.0.0)</version>
-       <scope>provided</scope>
-    </dependency>		
-     -->		
-	</dependencies>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
-	<build>
-    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
-    <finalName>org.apache.uima.caseditor.ide_${parsedVersion.osgiVersion}</finalName>  
+  <build>
+    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+    <finalName>org.apache.uima.caseditor.ide_${parsedVersion.osgiVersion}</finalName>
     <resources>
       <resource>
         <directory>.</directory>
@@ -318,18 +174,18 @@
               <configuration>
                 <excludes combine.children="append">
                   <exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
-                </excludes>              
+                </excludes>
               </configuration>
             </execution>
           </executions>
-        </plugin>   
+        </plugin>
       </plugins>
     </pluginManagement>
-    	
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <executions>
           <execution>
             <id>uima-bundle</id>
@@ -364,7 +220,7 @@
                   !org.eclipse.ui.actions,
                   !org.eclipse.ui.dialogs,
                   !org.eclipse.ui.model,
-                  !org.eclipse.ui.part, 
+                  !org.eclipse.ui.part,
                   !org.eclipse.core.runtime,
                   !org.osgi.framework,
                   org.apache.uima.caseditor.editor.editview,
@@ -376,8 +232,8 @@
             </configuration>
           </execution>
         </executions>
-			</plugin>
-            
-		</plugins>
-	</build>
+      </plugin>
+
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index 4dce7e8..a5abb22 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -1,24 +1,26 @@
 <?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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.uima</groupId>
@@ -26,21 +28,21 @@
     <version>3.2.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
-  
-	<artifactId>uimaj-ep-cas-editor</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache UIMA Eclipse: ${project.artifactId}</name>
+
+  <artifactId>uimaj-ep-cas-editor</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache UIMA Eclipse: ${project.artifactId}</name>
   <description>Allows editing the contents of a saved CAS</description>
   <url>${uimaWebsiteUrl}</url>
-  
+
   <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that computes the connection elements
-       from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
+    even though the <scm> element that follows is exactly the
+    same as those in super poms, it cannot be inherited because
+    there is some special code that computes the connection elements
+    from the chain of parent poms, if this is omitted.
+
+    Keeping this a bit factored allows cutting/pasting the <scm>
+    element, and just changing the following two properties -->
   <scm>
     <connection>
       scm:git:https://github.com/apache/uima-uimaj/uimaj-ep-cas-editor
@@ -53,28 +55,28 @@
     </url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
   </properties>
-  		
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-            <scope>test</scope>
-		</dependency>
 
-		<!-- UIMA dependencies -->
-		<!--
-			don't depend on the runtime plugin, instead, depend on the parts
-			needed
-		-->
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-core</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>compile</scope>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- UIMA dependencies -->
+    <!--
+      don't depend on the runtime plugin, instead, depend on the parts
+      needed
+    -->
+    <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>
@@ -85,214 +87,76 @@
           <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>
-            <exclusions>
-              <exclusion>
-                <groupId>org.apache.uima</groupId>
-                <artifactId>uimaj-cpe</artifactId>
-              </exclusion>
-            </exclusions>
-      
-		</dependency>
-
-		<!-- Eclipse dependencies -->
-    <!-- 
-		<dependency>
-			<groupId>org.eclipse.core</groupId>
-			<artifactId>runtime</artifactId>
-			<version>[3.3.0.0,4.0.0)</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.core</groupId>
-			<artifactId>resources</artifactId>
-			<version>[3.3.0.0,4.0.0)</version>
-			<scope>provided</scope>
-		</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>
 
-		<dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>org.eclipse.jdt.ui</artifactId>
-      <version>[3.12.0,4.0.0)</version>
-      <scope>provided</scope>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-tools</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>compile</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>
+          <groupId>org.apache.uima</groupId>
+          <artifactId>uimaj-cpe</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-     
-		<dependency>
-			<groupId>org.eclipse.swt</groupId>
-			<artifactId>org.eclipse.swt.win32.win32.x86</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,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>
-    -->
+
+    <!-- Eclipse dependencies -->
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.jdt.ui</artifactId>
+      <version>[3.12.0,4.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
-      <groupId>org.eclipse.platform</groupId>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+      <version>[3.2.0,5.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</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>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.core.resources</artifactId>
       <version>[3.11.1,4.0.0)</version>
       <scope>provided</scope>
     </dependency>
-    
-    
-		<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.9.0,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.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>
-         <!-- 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.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>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.ui.views</artifactId>
+      <version>[3.9.0,4.0.0)</version>
       <scope>provided</scope>
     </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>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <version>[3.10.0,4.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.jface.text</artifactId>
+      <version>[3.11.0,4.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.equinox.app</artifactId>
+      <version>[1.2.0,2.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
+
+  </dependencies>
 
-	<build>
-    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
-    <finalName>org.apache.uima.caseditor_${parsedVersion.osgiVersion}</finalName>  
+  <build>
+    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+    <finalName>org.apache.uima.caseditor_${parsedVersion.osgiVersion}</finalName>
     <resources>
       <resource>
         <directory>.</directory>
@@ -316,18 +180,18 @@
               <configuration>
                 <excludes combine.children="append">
                   <exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
-                </excludes>              
+                </excludes>
               </configuration>
             </execution>
           </executions>
-        </plugin>   
+        </plugin>
       </plugins>
     </pluginManagement>
-    	
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <executions>
           <execution>
             <id>uima-bundle</id>
@@ -339,7 +203,7 @@
                 <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                 <Export-Package>
                   org.apache.uima.caseditor.*
-                      </Export-Package>
+                </Export-Package>
                 <Require-Bundle>
                   org.eclipse.jface.text,
                   org.eclipse.text,
@@ -362,7 +226,7 @@
                   !org.eclipse.ui.actions,
                   !org.eclipse.ui.dialogs,
                   !org.eclipse.ui.model,
-                  !org.eclipse.ui.part, 
+                  !org.eclipse.ui.part,
                   !org.eclipse.core.runtime,
                   !org.osgi.framework,
                   *
@@ -371,8 +235,7 @@
             </configuration>
           </execution>
         </executions>
-			</plugin>
-            
-		</plugins>
-	</build>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index 7a4b894..584a24c 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -114,341 +114,33 @@
     </dependency>
 
     <!-- Eclipse dependencies -->
-
-    <!-- most of these are commented out as of 2/2008
-         They're not needed because the dependency mechanism
-         includes the transitive closure
-
-         Not sure what's the best practice here, so leaving these
-         in as comments
-      -->
-
-
-    <!-- core -->
-    <!--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.core</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!-- ui -->
-        <!-- next one causes NPE with maven 2.0.7.
-      Might be related to https://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>
-      <artifactId>org.eclipse.ui</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!--dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>org.eclipse.ui.editors</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!--dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>org.eclipse.ui.forms</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </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.ui</groupId>
-      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!-- jdt -->
-    <!--dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>org.eclipse.jdt.core</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!-- added in Feb 2008 rework -->
-    <!--dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>org.eclipse.jdt.launching</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency-->
-   
-
-    <!--  
-     
-    <dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>org.eclipse.jdt.ui</artifactId>
-      <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>
-      <artifactId>org.eclipse.jface.text</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency-->
-
-    <!--dependency>
-      <groupId>org.eclipse.pde</groupId>
-      <artifactId>org.eclipse.pde.ui</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>
-    </dependency
-
-    
-     -->
     <dependency>
-      <groupId>org.eclipse.platform</groupId>
+      <groupId>${eclipseP2RepoId}</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>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
       <version>[3.2.0,5.0.0)</version>
       <scope>provided</scope>
     </dependency>
-    
     <dependency>
-      <groupId>org.eclipse.platform</groupId>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.jface</artifactId>
-      <version>[3.16.0, 4.0.0)</version>
+      <version>[3.13.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.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>
-    <!-- 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>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>         
-     <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</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.contenttype</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.preferences</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.filesystem</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.common</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ant</groupId>
-      <artifactId>org.eclipse.ant.core</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.expressions</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.variables</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>    
-  -->
   </dependencies>
 
   <build>
-
     <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
     <finalName>org.apache.uima.desceditor_${parsedVersion.osgiVersion}</finalName>
     <plugins>
diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml
index 50a4ffe..83cc993 100644
--- a/uimaj-ep-debug/pom.xml
+++ b/uimaj-ep-debug/pom.xml
@@ -1,25 +1,27 @@
 <?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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
@@ -27,22 +29,22 @@
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
-	<artifactId>uimaj-ep-debug</artifactId>
-	<packaging>jar</packaging> 
-	<name>Apache UIMA Eclipse: ${project.artifactId}</name>
+  <artifactId>uimaj-ep-debug</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache UIMA Eclipse: ${project.artifactId}</name>
   <!-- continuation lines need to start in col 1 else manifest has extra blanks -->
   <description>Adds structure knowledge for common
 UIMA data structures to the Eclipse Debug displays</description>
   <url>${uimaWebsiteUrl}</url>
 
   <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that incorrectly computes the 
-       connection elements from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
+    even though the <scm> element that follows is exactly the
+    same as those in super poms, it cannot be inherited because
+    there is some special code that incorrectly computes the
+    connection elements from the chain of parent poms, if this is omitted.
+
+    Keeping this a bit factored allows cutting/pasting the <scm>
+    element, and just changing the following two properties -->
   <scm>
     <connection>
       scm:git:https://github.com/apache/uima-uimaj/uimaj-ep-debug
@@ -55,26 +57,12 @@ UIMA data structures to the Eclipse Debug displays</description>
     </url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
   </properties>
-  
-	<dependencies>
-    <!-- depending on the ep-runtime doesn't work without manual intervention because
-         eclipse:eclipse on the ep-runtime doesn't mark the embedded things as "exported".
-         It doesn't matter which scope - compile or provided - is used, both fail
-      
-         Other posts indicate that plugins should have explicit dependencies, anyway.
-         And, it lets these plugins work when the library plugin is "open" in the same workspace.
-      -->
-    <!--dependency>
-      <groupId>org.apache.uima</groupId>
-      <artifactId>uimaj-ep-runtime</artifactId>
-      <version>${uimaj-release-eclipse-version}</version>
-      <scope>compile</scope>       
-    </dependency-->
-    
+
+  <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
@@ -91,134 +79,18 @@ UIMA data structures to the Eclipse Debug displays</description>
         </exclusion>
       </exclusions>
     </dependency>
-    
-    <!-- next dependency is commented out due to Maven 2.0.7 throwing NPE 
-         Might be related to https://jira.codehaus.org/browse/MNG-3086 -->
-		<!--dependency>
-			<groupId>org.eclipse.ui</groupId>
-			<artifactId>org.eclipse.ui</artifactId>
-			<version>3.2.0</version>
-			<scope>provided</scope>
-		</dependency-->
-    
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.debug.ui</artifactId>
-			<version>[3.8.0, 4.0.0)</version>
-			<scope>provided</scope>
-			
-      <exclusions>
-        <!-- 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>
-        <!-- https://issues.apache.org/jira/browse/UIMA-5252 -->
-        <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>
-    
-    <!-- dependencies added to overcome 3.6 maven central corrupted upload 
     <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.filesystem</artifactId>
-      <version>1.0.0</version>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.jdt.debug.ui</artifactId>
+      <version>[3.8.0, 4.0.0)</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <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.equinox</groupId>
-      <artifactId>org.eclipse.equinox.common</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.expressions</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.variables</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ant</groupId>
-      <artifactId>org.eclipse.ant.core</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.registry</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.jobs</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.preferences</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.contenttype</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    -->
-	</dependencies>
-  
-	<build>  
-    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
-		<finalName>org.apache.uima.debug_${parsedVersion.osgiVersion}</finalName>   	    
-		<plugins>
+  </dependencies>
+
+  <build>
+    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+    <finalName>org.apache.uima.debug_${parsedVersion.osgiVersion}</finalName>
+    <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -229,29 +101,30 @@ UIMA data structures to the Eclipse Debug displays</description>
             <Export-Package>
               org.apache.uima.ep_debug
             </Export-Package>
-            
+
             <Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
             <Bundle-SymbolicName>org.apache.uima.debug;singleton:=true</Bundle-SymbolicName>
-             
+
             <!-- handle split packages in Eclipse.
-               We do this by using Require-Bundle, and excluding from the Import-Package those
-                 split packages covered by those bundles - this is required by OSGi.
-                                
-                org.eclipse.core.runtime has combined apis (that were split in later 
-                  point releases of 3.x)
+              We do this by using Require-Bundle, and excluding from the Import-Package those
+              split packages covered by those bundles - this is required by OSGi.
+
+              org.eclipse.core.runtime has combined apis (that were split in later
+              point releases of 3.x)
             -->
-            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is potentially wrong -->
+            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is 
+              potentially wrong -->
             <Require-Bundle>org.eclipse.core.runtime</Require-Bundle>
             <Import-Package>
-              !org.eclipse.core.runtime,                 
+              !org.eclipse.core.runtime,
               *,
               org.eclipse.ui.plugin
-            </Import-Package>  
+            </Import-Package>
 
             <Eclipse-AutoStart>true</Eclipse-AutoStart>
           </instructions>
         </configuration>
-      </plugin>      		
-		</plugins>
-	</build>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
index 834f318..e406960 100644
--- a/uimaj-ep-jcasgen/pom.xml
+++ b/uimaj-ep-jcasgen/pom.xml
@@ -1,47 +1,49 @@
 <?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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
     <version>3.2.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
-  
-	<artifactId>uimaj-ep-jcasgen</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache UIMA Eclipse: ${project.artifactId}</name>
+
+  <artifactId>uimaj-ep-jcasgen</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache UIMA Eclipse: ${project.artifactId}</name>
   <description>Provides a connection to the JCasGen tooling, for
     the Component Descriptor Editor</description>
   <url>${uimaWebsiteUrl}</url>
-  
+
   <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that computes the connection elements
-       from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
+    even though the <scm> element that follows is exactly the
+    same as those in super poms, it cannot be inherited because
+    there is some special code that computes the connection elements
+    from the chain of parent poms, if this is omitted.
+
+    Keeping this a bit factored allows cutting/pasting the <scm>
+    element, and just changing the following two properties -->
   <scm>
     <connection>
       scm:git:https://github.com/apache/uima-uimaj/uimaj-ep-jcasgen
@@ -54,23 +56,23 @@
     </url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
     <postNoticeText>${ibmNoticeText}</postNoticeText>
   </properties>
-  
-	<dependencies>
+
+  <dependencies>
     <!-- UIMA dependencies -->
-    <!-- don't depend on the runtime plugin, instead, 
-         depend on the parts needed -->
+    <!-- don't depend on the runtime plugin, instead,
+      depend on the parts needed -->
     <!--dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-ep-runtime</artifactId>
       <version>${uimaj-release-eclipse-version}</version>
-      <scope>compile</scope>     
-    </dependency-->
-    
+      <scope>compile</scope>
+      </dependency -->
+
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
@@ -87,7 +89,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    		
+
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-tools</artifactId>
@@ -100,127 +102,37 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
+
     <!-- Eclipse dependencies -->
-    <!-- 
-		<dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.runtime</artifactId>
-      <version>3.2.0</version>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.jdt.core</artifactId>
+      <version>[3.12.0, 4.0.0)</version>
       <scope>provided</scope>
     </dependency>
-     -->
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
-			<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>
       <groupId>org.eclipse.emf</groupId>
       <artifactId>codegen</artifactId>
-      <!--version>2.9.1</version-->
+      <!--version>2.9.1</version -->
       <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>
-    
-    
-    <!-- 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</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.jobs</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.contenttype</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.preferences</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.filesystem</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.common</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ant</groupId>
-      <artifactId>org.eclipse.ant.core</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.expressions</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.variables</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-   -->
-         
-             
-	</dependencies>
-  
-	<build>
-    
-    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
-		<finalName>org.apache.uima.jcas.jcasgenp_${parsedVersion.osgiVersion}</finalName>
-    	
- 		<plugins>
+  </dependencies>
+
+  <build>
+
+    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+    <finalName>org.apache.uima.jcas.jcasgenp_${parsedVersion.osgiVersion}</finalName>
+
+    <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -235,27 +147,28 @@
 
             <!-- handle split packages in Eclipse.
               We do this by using Require-Bundle, and excluding from the Import-Package those
-                split packages covered by those bundles - this is required by OSGi.
-                               
-               org.eclipse.core.runtime has combined apis (that were split in later 
-                 point releases of 3.x)
+              split packages covered by those bundles - this is required by OSGi.
+
+              org.eclipse.core.runtime has combined apis (that were split in later
+              point releases of 3.x)
             -->
-            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is potentially wrong -->
+            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is 
+              potentially wrong -->
             <Require-Bundle>org.eclipse.core.runtime</Require-Bundle>
             <!-- the bottom two imports are needed by Eclipse to get things to compile, but
-                 not needed by maven -->
+              not needed by maven -->
             <Import-Package>
-              !org.eclipse.core.runtime,                 
-              org.osgi.framework, 
+              !org.eclipse.core.runtime,
+              org.osgi.framework,
               org.eclipse.jdt.core.jdom,
-              *  
-            </Import-Package> 
+              *
+            </Import-Package>
             <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
             <Eclipse-AutoStart>true</Eclipse-AutoStart>
-            <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>            
+            <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
           </instructions>
         </configuration>
-      </plugin> 
-		</plugins>
-	</build>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml
index 91c507d..4a1bb66 100644
--- a/uimaj-ep-launcher/pom.xml
+++ b/uimaj-ep-launcher/pom.xml
@@ -1,25 +1,27 @@
 <?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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
@@ -27,21 +29,21 @@
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
 
-	<artifactId>uimaj-ep-launcher</artifactId>
-	<packaging>jar</packaging> 
-	<name>Apache UIMA Eclipse: ${project.artifactId}</name>
+  <artifactId>uimaj-ep-launcher</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache UIMA Eclipse: ${project.artifactId}</name>
   <!-- continuation lines need to start in col 1 else manifest has extra blanks -->
   <description>Adds launch support for Analysis Engines </description>
   <url>${uimaWebsiteUrl}</url>
 
   <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that incorrectly computes the 
-       connection elements from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
+    even though the <scm> element that follows is exactly the
+    same as those in super poms, it cannot be inherited because
+    there is some special code that incorrectly computes the
+    connection elements from the chain of parent poms, if this is omitted.
+
+    Keeping this a bit factored allows cutting/pasting the <scm>
+    element, and just changing the following two properties -->
   <scm>
     <connection>
       scm:git:https://github.com/apache/uima-uimaj/uimaj-ep-launcher
@@ -54,26 +56,26 @@
     </url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
   </properties>
-  
-	<dependencies>
+
+  <dependencies>
     <!-- depending on the ep-runtime doesn't work without manual intervention because
-         eclipse:eclipse on the ep-runtime doesn't mark the embedded things as "exported".
-         It doesn't matter which scope - compile or provided - is used, both fail
-      
-         Other posts indicate that plugins should have explicit dependencies, anyway.
-         And, it lets these plugins work when the library plugin is "open" in the same workspace.
-      -->
+      eclipse:eclipse on the ep-runtime doesn't mark the embedded things as "exported".
+      It doesn't matter which scope - compile or provided - is used, both fail
+
+      Other posts indicate that plugins should have explicit dependencies, anyway.
+      And, it lets these plugins work when the library plugin is "open" in the same workspace.
+    -->
     <!--dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-ep-runtime</artifactId>
       <version>${uimaj-release-eclipse-version}</version>
-      <scope>compile</scope>       
-    </dependency-->
-    
+      <scope>compile</scope>
+      </dependency -->
+
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
@@ -90,202 +92,37 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
-    <!-- next dependency is commented out due to Maven 2.0.7 throwing NPE 
-         Might be related to https://jira.codehaus.org/browse/MNG-3086 -->
-		<!--dependency>
-			<groupId>org.eclipse.ui</groupId>
-			<artifactId>org.eclipse.ui</artifactId>
-			<version>3.2.0</version>
-			<scope>provided</scope>
-		</dependency-->
-    		<dependency>
-			<groupId>org.eclipse.swt</groupId>
-			<artifactId>org.eclipse.swt.win32.win32.x86</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,5.0.0)</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.debug.ui</artifactId>
+
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+      <version>[3.2.0,5.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.jdt.debug.ui</artifactId>
       <version>[3.8.0, 4.0.0)</version>
-			<scope>provided</scope>
-      <exclusions>
-        <!-- 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>
-        <!-- https://issues.apache.org/jira/browse/UIMA-5252 -->
-        <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>
+      <scope>provided</scope>
     </dependency>
-    
     <dependency>
-      <groupId>org.eclipse.platform</groupId>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.jface</artifactId>
-      <version>[3.16.0, 4.0.0)</version>
+      <version>[3.13.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.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>
-    
-    <!-- dependencies added to overcome 3.6 maven central corrupted upload -->
-    <!-- 
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.filesystem</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <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.equinox</groupId>
-      <artifactId>org.eclipse.equinox.common</artifactId>
-      <version>[3.3.0.0,4.0.0)</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.expressions</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.variables</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ant</groupId>
-      <artifactId>org.eclipse.ant.core</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.registry</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.jobs</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.preferences</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.contenttype</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>  
-     -->  
-	</dependencies>
-  
-	<build>  
-    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
-		<finalName>org.apache.uima.launcher_${parsedVersion.osgiVersion}</finalName>   	    
-		<plugins>
+  </dependencies>
+
+  <build>
+    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+    <finalName>org.apache.uima.launcher_${parsedVersion.osgiVersion}</finalName>
+    <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -297,51 +134,53 @@
             <Export-Package>
               org.apache.uima.ep_launcher
             </Export-Package>
-             
+
             <!-- handle split packages in Eclipse.
-               We do this by using Require-Bundle, and excluding from the Import-Package those
-                 split packages covered by those bundles - this is required by OSGi.
-                                
-                org.eclipse.core.runtime has combined apis (that were split in later 
-                  point releases of 3.x)
+              We do this by using Require-Bundle, and excluding from the Import-Package those
+              split packages covered by those bundles - this is required by OSGi.
+
+              org.eclipse.core.runtime has combined apis (that were split in later
+              point releases of 3.x)
             -->
             <Bundle-Activator>org.apache.uima.ep_launcher.LauncherPlugin</Bundle-Activator>
             <Bundle-SymbolicName>org.apache.uima.launcher;singleton:=true</Bundle-SymbolicName>
-            <!-- Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment invalid value : JavaSE-1.8 --> 
-            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is potentially wrong -->
+            <!-- Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment 
+              invalid value : JavaSE-1.8 -->
+            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is 
+              potentially wrong -->
             <Require-Bundle>org.eclipse.core.runtime</Require-Bundle>
             <Import-Package>
-              !org.eclipse.core.runtime,                 
-			  org.eclipse.core.resources,
-			  org.eclipse.core.variables,
-			  org.eclipse.core.commands.common,
-			  org.eclipse.debug.core,
-			  org.eclipse.debug.ui,
-			  org.eclipse.debug.ui.sourcelookup,
-			  org.eclipse.debug.core.model,
-			  org.eclipse.jdt.debug.ui.launchConfigurations,
-			  org.eclipse.jdt.launching,
-			  org.eclipse.jface.layout,
-			  org.eclipse.jface.preference,
-			  org.eclipse.jface.viewers,
-			  org.eclipse.jface.window,
-			  org.eclipse.jface.dialogs,
-			  org.eclipse.swt,
-			  org.eclipse.swt.events,
-			  org.eclipse.swt.layout,
-			  org.eclipse.swt.widgets,
-			  org.eclipse.ui,
-			  org.eclipse.ui.dialogs,
-			  org.eclipse.ui.model,
-			  org.eclipse.ui.plugin,
-			  org.osgi.framework;version="1.3"
+              !org.eclipse.core.runtime,
+              org.eclipse.core.resources,
+              org.eclipse.core.variables,
+              org.eclipse.core.commands.common,
+              org.eclipse.debug.core,
+              org.eclipse.debug.ui,
+              org.eclipse.debug.ui.sourcelookup,
+              org.eclipse.debug.core.model,
+              org.eclipse.jdt.debug.ui.launchConfigurations,
+              org.eclipse.jdt.launching,
+              org.eclipse.jface.layout,
+              org.eclipse.jface.preference,
+              org.eclipse.jface.viewers,
+              org.eclipse.jface.window,
+              org.eclipse.jface.dialogs,
+              org.eclipse.swt,
+              org.eclipse.swt.events,
+              org.eclipse.swt.layout,
+              org.eclipse.swt.widgets,
+              org.eclipse.ui,
+              org.eclipse.ui.dialogs,
+              org.eclipse.ui.model,
+              org.eclipse.ui.plugin,
+              org.osgi.framework;version="1.3"
             </Import-Package>
-			
+
             <Eclipse-AutoStart>true</Eclipse-AutoStart>
             <Plugin-Class>org.apache.uima.ep_launcher.LauncherPlugin</Plugin-Class>
           </instructions>
         </configuration>
-      </plugin>      		
-		</plugins>
-	</build>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml
index 4df3530..b0601a8 100644
--- a/uimaj-ep-pear-packager/pom.xml
+++ b/uimaj-ep-pear-packager/pom.xml
@@ -1,47 +1,49 @@
 <?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.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-  
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimaj-parent</artifactId>
     <version>3.2.0-SNAPSHOT</version>
     <relativePath>../uimaj-parent/pom.xml</relativePath>
   </parent>
-  
-	<artifactId>uimaj-ep-pear-packager</artifactId>
-	<packaging>jar</packaging>
-	<name>Apache UIMA Eclipse: ${project.artifactId}</name>
+
+  <artifactId>uimaj-ep-pear-packager</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache UIMA Eclipse: ${project.artifactId}</name>
   <description>Provides an Eclipse Wizard to construct
     a PEAR package</description>
   <url>${uimaWebsiteUrl}</url>
-  
+
   <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that computes the connection elements
-       from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
+    even though the <scm> element that follows is exactly the
+    same as those in super poms, it cannot be inherited because
+    there is some special code that computes the connection elements
+    from the chain of parent poms, if this is omitted.
+
+    Keeping this a bit factored allows cutting/pasting the <scm>
+    element, and just changing the following two properties -->
   <scm>
     <connection>
       scm:git:https://github.com/apache/uima-uimaj/uimaj-ep-pear-packager
@@ -54,27 +56,27 @@
     </url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
   </properties>
 
-	<dependencies>
+  <dependencies>
     <!-- UIMA dependencies -->
     <!-- depending on the ep-runtime doesn't work without manual intervention because
-         eclipse:eclipse on the ep-runtime doesn't mark the embedded things as "exported".
-         It doesn't matter which scope - compile or provided - is used, both fail
-      
-         Other posts indicate that plugins should have explicit dependencies, anyway.
-         And, it lets these plugins work when the library plugin is "open" in the same workspace.
-      -->
+      eclipse:eclipse on the ep-runtime doesn't mark the embedded things as "exported".
+      It doesn't matter which scope - compile or provided - is used, both fail
+
+      Other posts indicate that plugins should have explicit dependencies, anyway.
+      And, it lets these plugins work when the library plugin is "open" in the same workspace.
+    -->
     <!--dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-ep-runtime</artifactId>
       <version>${uimaj-release-eclipse-version}</version>
-      <scope>compile</scope>       
-    </dependency-->
-    
+      <scope>compile</scope>
+      </dependency -->
+
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
@@ -91,207 +93,45 @@
         </exclusion>
       </exclusions>
     </dependency>
-    			
-    <!-- Eclipse dependencies 
+
+    <!-- Eclipse dependencies -->
     <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.resources</artifactId>
-      <version>3.2.0</version>      
+      <groupId>${eclipseP2RepoId}</groupId>
+      <artifactId>org.eclipse.jdt.core</artifactId>
+      <version>[3.12.0, 4.0.0)</version>
       <scope>provided</scope>
     </dependency>
-    
-		<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.12.0, 4.0.0)</version>
-			<scope>provided</scope>
-		</dependency>	
-    
     <dependency>
-      <groupId>org.eclipse.platform</groupId>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.jface</artifactId>
-      <version>[3.16.0, 4.0.0)</version>
+      <version>[3.13.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.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>
-        <!-- 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>
-			<scope>provided</scope>
-		</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>
-        <!-- 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>
-       <scope>provided</scope>
-     </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>
+      <groupId>${eclipseP2RepoId}</groupId>
       <artifactId>org.eclipse.ui</artifactId>
-      <version>3.2.0</version>
-    </dependency-->
-    
-    <!-- the need for this one may go away when the ui dependency 
-         can be included -->
+      <version>[3.108.1, 4.0.0)</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.swt</groupId>
       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
       <version>[3.2.0,5.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</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.jobs</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.contenttype</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.preferences</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>  
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.filesystem</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>org.eclipse.equinox.common</artifactId>
-      <version>3.2.0</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ant</groupId>
-      <artifactId>org.eclipse.ant.core</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.expressions</artifactId>
-      <version>3.2.1</version>
-      <scope>provided</scope>      
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>org.eclipse.core.variables</artifactId>
-      <version>3.1.100</version>
-      <scope>provided</scope>      
-    </dependency>    
-     -->    
-	</dependencies>
-	<build>
-    
-    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->  
+  </dependencies>
+  <build>
+
+    <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
     <finalName>org.apache.uima.pear_${parsedVersion.osgiVersion}</finalName>
-    
- 		<plugins>
+
+    <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -307,61 +147,62 @@
               org.apache.uima.pear.insd.edit.vars,
               org.apache.uima.pear.nature
             </Export-Package>
-                
+
             <!-- handle split packages in Eclipse.
               We do this by using Require-Bundle, and excluding from the Import-Package those
-                split packages covered by those bundles - this is required by OSGi.
-                               
-               There are 4 packages in org.eclipse.jface.* that are "split" between bundles 
-                  org.eclipse.jface.text and org.eclipse.text.
-                 Packages:
-                  org.eclipse.jface.text
-                  org.eclipse.jface.text.link
-                  org.eclipse.jface.text.source
-                  org.eclipse.jface.text.templates 
-               org.eclipse.ui.texteditor is split between 
-                 org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
-                 Packages: 
-                  org.eclipse.ui.texteditor
-               There are 5 packages in org.eclipse.ui.*  that are split between 
-                 org.eclipse.ui.ide and org.eclipse.ui.workbench.  
-                 The Notes say not to require org.eclipse.ui.workbench, but instead just require
-                    org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
-                 Packages:
-                  org.eclipse.ui
-                  org.eclipse.ui.actions
-                  org.eclipse.ui.dialogs
-                  org.eclipse.ui.model
-                  org.eclipse.ui.part
-               org.eclipse.core.runtime has combined apis (that were split in later 
-                 point releases of 3.x)
+              split packages covered by those bundles - this is required by OSGi.
+
+              There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+              org.eclipse.jface.text and org.eclipse.text.
+              Packages:
+              org.eclipse.jface.text
+              org.eclipse.jface.text.link
+              org.eclipse.jface.text.source
+              org.eclipse.jface.text.templates
+              org.eclipse.ui.texteditor is split between
+              org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+              Packages:
+              org.eclipse.ui.texteditor
+              There are 5 packages in org.eclipse.ui.* that are split between
+              org.eclipse.ui.ide and org.eclipse.ui.workbench.
+              The Notes say not to require org.eclipse.ui.workbench, but instead just require
+              org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+              Packages:
+              org.eclipse.ui
+              org.eclipse.ui.actions
+              org.eclipse.ui.dialogs
+              org.eclipse.ui.model
+              org.eclipse.ui.part
+              org.eclipse.core.runtime has combined apis (that were split in later
+              point releases of 3.x)
             -->
-            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is potentially wrong -->            
+            <!-- NOTE: ANY CONTINUATION LINES for Require-Bundle MUST START IN Col1 else manifest is 
+              potentially wrong -->
             <Require-Bundle>
-org.eclipse.jface.text,
-org.eclipse.text,
-org.eclipse.ui.editors,
-org.eclipse.ui.workbench.texteditor,
-org.eclipse.ui.ide,
-org.eclipse.ui,
-org.eclipse.ui.workbench,
-org.eclipse.core.runtime
+              org.eclipse.jface.text,
+              org.eclipse.text,
+              org.eclipse.ui.editors,
+              org.eclipse.ui.workbench.texteditor,
+              org.eclipse.ui.ide,
+              org.eclipse.ui,
+              org.eclipse.ui.workbench,
+              org.eclipse.core.runtime
             </Require-Bundle>
-            <Import-Package>              
+            <Import-Package>
               !org.eclipse.core.runtime,
               !org.eclipse.ui,
               !org.eclipse.ui.dialogs,
-              !org.eclipse.ui.model, 
+              !org.eclipse.ui.model,
               *
-            </Import-Package> 
-    
+            </Import-Package>
+
             <Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
             <Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
-            
+
             <Eclipse-AutoStart>true</Eclipse-AutoStart>
           </instructions>
         </configuration>
-      </plugin>  
-		</plugins>
-	</build>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 685e7c8..b5a6545 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -32,7 +32,7 @@
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom</artifactId>
     <relativePath />
-    <version>14-SNAPSHOT</version>
+    <version>14</version>
   </parent>
 
   <artifactId>uimaj-parent</artifactId>
@@ -107,6 +107,12 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
+    
+    <repository>
+      <id>${eclipseP2RepoId}</id>
+      <url>${eclipseP2RepoUrl}</url>
+      <layout>p2</layout>
+    </repository>
   </repositories>
   
   <pluginRepositories>
@@ -129,6 +135,11 @@
       </snapshots>
     </pluginRepository>
     -->
+    <pluginRepository>
+      <id>artifactory.openntf.org</id>
+      <name>artifactory.openntf.org</name>
+      <url>https://artifactory.openntf.org/openntf</url>
+    </pluginRepository>
   </pluginRepositories>
   
   <properties>
@@ -146,6 +157,9 @@
     
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
+    
+    <eclipseP2RepoId>org.eclipse.p2.oxygen</eclipseP2RepoId>
+    <eclipseP2RepoUrl>http://download.eclipse.org/releases/oxygen/</eclipseP2RepoUrl>
 
     <api_check_oldVersion>3.1.1</api_check_oldVersion>
   </properties>
@@ -180,6 +194,50 @@
         <artifactId>xmlunit</artifactId>
         <version>1.6</version>
       </dependency>
+      <dependency>
+        <groupId>${eclipseP2RepoId}</groupId>
+        <artifactId>org.eclipse.jdt.debug.ui</artifactId>
+        <version>[3.8.0, 4.0.0)</version>
+        <exclusions>
+          <exclusion>
+            <!-- 
+              The p2 resolver appears to have trouble with the "icu-data" classifier
+             -->
+            <groupId>org.eclipse</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>org.eclipse</groupId>
+            <artifactId>org.eclipse.jdt.debug</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>${eclipseP2RepoId}</groupId>
+        <artifactId>org.eclipse.jdt.ui</artifactId>
+        <version>[3.8.0, 4.0.0)</version>
+        <exclusions>
+          <exclusion>
+            <!-- 
+              The p2 resolver appears to have trouble with the "icu-data" classifier
+             -->
+            <groupId>org.eclipse</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>org.eclipse</groupId>
+            <artifactId>org.eclipse.jdt.debug</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -197,6 +255,13 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.openntf.maven</groupId>
+        <artifactId>p2-layout-resolver</artifactId>
+        <version>1.2.0</version>
+        <extensions>true</extensions>
+      </plugin>
+    
+      <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <executions>