You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2020/06/10 13:12:38 UTC

[uima-async-scaleout] 10/17: [UIMA-1756] convert uima-as to new build parents

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

cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git

commit cfebb25665b5f2b6efe56d3801ee6b9dff204feb
Author: schor <schor>
AuthorDate: Thu May 6 20:52:58 2010 +0000

    [UIMA-1756] convert uima-as to new build parents
---
 uimaj-as-activemq/pom.xml                          |  83 ++++--
 uimaj-as-camel/pom.xml                             |  79 ++++--
 uimaj-as-core/pom.xml                              |  61 +++--
 uimaj-as-jms/pom.xml                               |  56 ++--
 uimaj-as-osgi-runtime/pom.xml                      | 162 ++++++------
 uimaj-as/eclipse-plugin-superPom/.project          |  17 ++
 .../.settings/org.maven.ide.eclipse.prefs          |   9 +
 uimaj-eclipse-feature-deployeditor/pom.xml         |  46 +++-
 uimaj-ep-deployeditor/pom.xml                      | 286 ++++++++++-----------
 uimaj-ep-runtime-deployeditor/pom.xml              | 109 ++++----
 10 files changed, 549 insertions(+), 359 deletions(-)

diff --git a/uimaj-as-activemq/pom.xml b/uimaj-as-activemq/pom.xml
index f5ebfdb..65c3a1c 100644
--- a/uimaj-as-activemq/pom.xml
+++ b/uimaj-as-activemq/pom.xml
@@ -22,18 +22,46 @@
 	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>
-	<groupId>org.apache.uima</groupId>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>parent-pom-ibm-notice</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+  
 	<artifactId>uimaj-as-activemq</artifactId>
-	<packaging>jar</packaging>
-	<version>${uimaj-as-release-version}</version>
-	<name>Apache UIMA Async Scaleout using ActiveMQ</name>
+	<version>2.3.1-SNAPSHOT</version>
+	<name>UIMA-AS: ${project.artifactId}</name>
+  <description>UIMA-AS ActiveMQ incorporation</description>
 	<url>http://incubator.apache.org/uima</url>
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>uimaj-as</artifactId>
-		<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj-as</relativePath>
-	</parent>
+
+  <!-- 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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uimaj</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+    <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+  </properties>
+
 	<dependencies>
 		
 	<!--dependency>
@@ -46,7 +74,7 @@
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-core</artifactId>
-			<version>${uimaj-release-version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -202,14 +230,14 @@
 		<dependency>
 		    <groupId>org.apache.uima</groupId>
 		    <artifactId>uimaj-as-core</artifactId>
-			<version>${uimaj-as-release-version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 		    <groupId>org.apache.uima</groupId>
 		    <artifactId>uimaj-as-jms</artifactId>
-			<version>${uimaj-as-release-version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		
@@ -260,7 +288,7 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-examples</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 		
@@ -274,15 +302,18 @@
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-test-util</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
 	</dependencies>
 	<build>
-		<finalName>${artifactId}</finalName>
+		<finalName>${project.artifactId}</finalName>
 		<plugins>
-		<plugin>
+      <!-- This plugin makes the tests run by
+             - giving more memory to them, and
+             - eliminating the very slow integration test -->
+		  <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
@@ -291,7 +322,23 @@
 					   <include>**/TestUimaASBasic.java</include>
 					</includes>
 				</configuration>
-		</plugin>		
+		  </plugin>
+      
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-cli</id>
+            <configuration>
+              <excludes>
+                <exclude>src/test/resources/data/DoubleByteText.txt</exclude> <!-- test data -->
+              </excludes>              
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>   
+      		
 	  </plugins>		
 	</build>	
 </project>
\ No newline at end of file
diff --git a/uimaj-as-camel/pom.xml b/uimaj-as-camel/pom.xml
index d18603a..d03f7de 100644
--- a/uimaj-as-camel/pom.xml
+++ b/uimaj-as-camel/pom.xml
@@ -1,5 +1,4 @@
 <?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
@@ -18,24 +17,48 @@
    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>
 
-	<groupId>org.apache.uima</groupId>
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>parent-pom-eclipse-plugins</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
 	<artifactId>uimaj-as-camel</artifactId>
-	<packaging>bundle</packaging>
-	<version>${uimaj-as-release-version}</version>
-	<name>Apache UIMA Async Scaleout Camel Driver</name>
+	<packaging>jar</packaging>
+	<version>2.3.1-SNAPSHOT</version>
+	<name>Apache UIMA-AS Camel Driver: ${project.artifactId}</name>
+  <description>Apache UIMA-AS Camel Driver</description>
 	<url>http://incubator.apache.org/uima</url>
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>uimaj-as</artifactId>
-		<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj-as</relativePath>
-	</parent>
+
+  <!-- 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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
 
 	<dependencies>
 		<dependency>
@@ -48,40 +71,44 @@
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-core</artifactId>
-			<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
+			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-as-core</artifactId>
-			<version>${uimaj-as-release-version}</version>
+      <version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-as-activemq</artifactId>
-			<version>${uimaj-as-release-version}</version>
+      <version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
+    
+    <finalName>org.apache.uima.camel_${parsedVersion.osgiVersion}</finalName>
 		<defaultGoal>install</defaultGoal>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.0.0</version>
-				<extensions>true</extensions>
-				<configuration>
-					<manifestLocation>META-INF</manifestLocation>
-					<instructions>
-						<Bundle-SymbolicName>org.apache.uima.camel</Bundle-SymbolicName>
-						<Private-Package>org.apache.uima.camel</Private-Package>
-					</instructions>
-				</configuration>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>uima-bundle</id>
+            <configuration>
+              <instructions>
+                <Bundle-SymbolicName>org.apache.uima.camel</Bundle-SymbolicName>
+                <Private-Package>org.apache.uima.camel</Private-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/uimaj-as-core/pom.xml b/uimaj-as-core/pom.xml
index a5daf5d..008736f 100644
--- a/uimaj-as-core/pom.xml
+++ b/uimaj-as-core/pom.xml
@@ -1,6 +1,3 @@
-<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">
 <!--
    ***************************************************************
    * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,22 +18,51 @@
    * 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>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>parent-pom-ibm-notice</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
 	<groupId>org.apache.uima</groupId>
 	<artifactId>uimaj-as-core</artifactId>
-	<packaging>jar</packaging>
-	<version>${uimaj-as-release-version}</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<name>Apache UIMA Async Scaleout core</name>
 	<url>http://incubator.apache.org/uima</url>
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>uimaj-as</artifactId>
-		<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj-as</relativePath>
-	</parent>
-	<dependencies>
 
-				
+  <!-- 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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
+
+	<dependencies>
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
@@ -47,7 +73,7 @@
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-core</artifactId>
-			<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -61,11 +87,4 @@
 	<build>
 		<finalName>${artifactId}</finalName>			
 	</build>
-  <!-- temp until we get top level uimaj-as pom -->
-  <repositories>
-    <repository>
-      <id>incubating repository</id>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository> 
-  </repositories>	
 </project>
\ No newline at end of file
diff --git a/uimaj-as-jms/pom.xml b/uimaj-as-jms/pom.xml
index 5ad2668..7ba9b8d 100644
--- a/uimaj-as-jms/pom.xml
+++ b/uimaj-as-jms/pom.xml
@@ -1,6 +1,3 @@
-<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">
 <!--
    ***************************************************************
    * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,24 +18,53 @@
    * 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>
-	<groupId>org.apache.uima</groupId>
+
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>parent-pom-ibm-notice</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+  
 	<artifactId>uimaj-as-jms</artifactId>
-	<packaging>jar</packaging>
-	<version>${uimaj-as-release-version}</version>
-	<name>Apache UIMA Async Scaleout JMS</name>
+	<version>2.3.1-SNAPSHOT</version>
+	<name>UIMA-AS: ${project.artifactId}</name>
 	<url>http://incubator.apache.org/uima</url>
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>uimaj-as</artifactId>
-		<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj-as</relativePath>
-	</parent>
+
+  <!-- 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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
+
 	<dependencies>	
 		<dependency>
 			<groupId>org.apache.uima</groupId>
 			<artifactId>uimaj-core</artifactId>
-			<version>${uimaj-release-version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -73,7 +99,7 @@
 		<dependency>
 		    <groupId>org.apache.uima</groupId>
 		    <artifactId>uimaj-as-core</artifactId>
-			<version>${uimaj-as-release-version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/uimaj-as-osgi-runtime/pom.xml b/uimaj-as-osgi-runtime/pom.xml
index 9ed7607..6096310 100644
--- a/uimaj-as-osgi-runtime/pom.xml
+++ b/uimaj-as-osgi-runtime/pom.xml
@@ -16,151 +16,169 @@
    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>
-  <!-- groupId omitted - inherited from parent -->
+  
+  <parent>
+    <groupId>org.apache.uima</groupId>
+    <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+  
   <artifactId>uimaj-as-osgi-runtime</artifactId>
-  <packaging>bundle</packaging>
-  <!-- version omitted - inherited from parent-->
+  <packaging>jar</packaging>
+  <version>2.3.1-SNAPSHOT</version>
   <name>Apache UIMA AS OSGI Runtime Fragment</name>
+  <description>Apache UIMA AS runtime code packaged for osgi use</description>
   <url>http://incubator.apache.org/uima</url>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+
+  <!-- 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 -->  
   <scm>
-    <url>http://svn.apache.org/viewvc/incubator/uima</url>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
   </scm>
-  <parent>
-    <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-eclipse-plugins</artifactId>
-    <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
-  </parent>
-
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
+  
   <!-- These dependencies should just be all the jars that
        need to be included in the library plugin -->
   <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-cpe</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-tools</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-examples</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-adapter-vinci</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>jVinci</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-as-core</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-as-jms</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-as-activemq</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.runtime.uimaas_${uimaj-release-eclipse-version}</finalName>
+    <finalName>org.apache.uima.runtime.uimaas_${parsedVersion.osgiVersion}</finalName>
 
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <!-- version 1.4.0 to support _nouses instruction -->
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <manifestLocation>META-INF</manifestLocation>
-          <instructions>
-            <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
-            <_nouses>true</_nouses>
-            <!-- export contents because we don't want the actual
-                 java code included (although we could... as an
-                 alternative to the jars - but might have a
-                 versioning / control issue -->
-            <_exportcontents>org.apache.uima.aae,org.apache.uima.aae.client,
-				org.apache.uima.aae.controller,
-				org.apache.uima.aae.delegate,
-				org.apache.uima.aae.deploymentDescriptor,
-				org.apache.uima.aae.error,
-				org.apache.uima.aae.error.handler,
-				org.apache.uima.aae.handler,
-				org.apache.uima.aae.handler.input,
-				org.apache.uima.aae.jms_adapter,
-				org.apache.uima.aae.jmx,org.apache.uima.aae.jmx.monitor,
-				org.apache.uima.aae.message,
-				org.apache.uima.aae.monitor,
-				org.apache.uima.aae.monitor.statistics,
-				org.apache.uima.aae.spi.transport,
-				org.apache.uima.aae.spi.transport.vm,
-				org.apache.uima.adapter.jms,
-				org.apache.uima.adapter.jms.activemq,
-				org.apache.uima.adapter.jms.client,
-				org.apache.uima.adapter.jms.message,
-				org.apache.uima.adapter.jms.service,
-				org.apache.uima.examples.as,
-				org.apache.uima.jms.error.handler
-            </_exportcontents>
-
-            <Import-Package>org.apache.log4j;resolution:=optional,*
-            </Import-Package>
-            <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
-            <Fragement-Host>org.apache.uima.runtime</Fragement-Host>
-            <Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
-          </instructions>
-        </configuration>
+        <executions>
+          <execution>
+            <id>uima-bundle</id>
+            <configuration>
+              <manifestLocation>META-INF</manifestLocation>
+              <instructions>
+                <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+                <_nouses>true</_nouses>
+                <!-- export contents because we don't want the actual
+                     java code included (although we could... as an
+                     alternative to the jars - but might have a
+                     versioning / control issue -->
+                <_exportcontents>org.apache.uima.aae,org.apache.uima.aae.client,
+            org.apache.uima.aae.controller,
+            org.apache.uima.aae.delegate,
+            org.apache.uima.aae.deploymentDescriptor,
+            org.apache.uima.aae.error,
+            org.apache.uima.aae.error.handler,
+            org.apache.uima.aae.handler,
+            org.apache.uima.aae.handler.input,
+            org.apache.uima.aae.jms_adapter,
+            org.apache.uima.aae.jmx,org.apache.uima.aae.jmx.monitor,
+            org.apache.uima.aae.message,
+            org.apache.uima.aae.monitor,
+            org.apache.uima.aae.monitor.statistics,
+            org.apache.uima.aae.spi.transport,
+            org.apache.uima.aae.spi.transport.vm,
+            org.apache.uima.adapter.jms,
+            org.apache.uima.adapter.jms.activemq,
+            org.apache.uima.adapter.jms.client,
+            org.apache.uima.adapter.jms.message,
+            org.apache.uima.adapter.jms.service,
+            org.apache.uima.examples.as,
+            org.apache.uima.jms.error.handler
+                </_exportcontents>
+    
+                <Import-Package>org.apache.log4j;resolution:=optional,*
+                </Import-Package>
+                <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+                <Fragement-Host>org.apache.uima.runtime</Fragement-Host>
+                <Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/uimaj-as/eclipse-plugin-superPom/.project b/uimaj-as/eclipse-plugin-superPom/.project
new file mode 100644
index 0000000..3c1d62c
--- /dev/null
+++ b/uimaj-as/eclipse-plugin-superPom/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>uimaj-as-eclipse-plugins</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs b/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 0000000..371014ef
--- /dev/null
+++ b/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Wed May 05 16:14:57 EDT 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/uimaj-eclipse-feature-deployeditor/pom.xml b/uimaj-eclipse-feature-deployeditor/pom.xml
index 8ff8fa7..2a71562 100644
--- a/uimaj-eclipse-feature-deployeditor/pom.xml
+++ b/uimaj-eclipse-feature-deployeditor/pom.xml
@@ -14,23 +14,51 @@
     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>
-  <!-- groupId omitted - inherited from parent -->
-  <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
-  <packaging>jar</packaging>
-  <!-- version omitted - inherited from parent-->
-  <name>Apache UIMA Eclipse Feature: Deploy Editor</name>
+  
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-eclipse-plugins</artifactId>
-    <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
+    <artifactId>parent-pom-top</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
   </parent>
+
+  <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
+  <packaging>jar</packaging>
+  <version>2.3.1-SNAPSHOT</version>
+  <name>UIMA Eclipse: ${project.artifactId}</name>
+  <description>UIMA Eclipse Plugin Feature for uima-as tooling</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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
+
   <build>
-    <finalName>org.apache.uima.as.deployeditor_${uimaj-release-eclipse-version}</finalName>
+    <finalName>org.apache.uima.as.deployeditor_${parsedVersion.osgiVersion}</finalName>
     <resources>
       <resource>
         <directory>.</directory>
diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml
index 4c67239..7374c53 100644
--- a/uimaj-ep-deployeditor/pom.xml
+++ b/uimaj-ep-deployeditor/pom.xml
@@ -16,51 +16,77 @@
    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>
-  <groupId>org.apache.uima</groupId>
-  <artifactId>uimaj-ep-deployeditor</artifactId>
-  <packaging>bundle</packaging>
-  <version>${uimaj-as-release-eclipse-version}</version>
-  <name>Apache UIMA Deployment Descriptor Editor Eclipse Plugin</name>
-  <url>http://incubator.apache.org/uima</url>
+  
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-as-eclipse-plugins</artifactId>
-    <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj-as/eclipse-plugin-superPom</relativePath>
+    <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <artifactId>uimaj-ep-deployeditor</artifactId>
+  <packaging>jar</packaging>
+  <version>2.3.1-SNAPSHOT</version>
+  <name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
+  <description>Extension to the Component Descriptor Editor supporting editing UIMA-AS deployment descriptors</description>
+  <url>http://incubator.apache.org/uima</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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
+
   <dependencies>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-ep-configurator</artifactId>
-      <version>${uimaj-release-eclipse-version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-tools</artifactId>
-      <version>${uimaj-release-version}</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
-      <version>${uimaj-as-release-eclipse-version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -182,152 +208,108 @@
   </dependencies>
 
   <build>
-    <finalName>org.apache.uima.deployeditor_${uimaj-release-eclipse-version}</finalName>
-
-    <!-- needed to copy resources, icons, and the plugin.xml to the result -->
-    <resources>
-      <resource>   <!-- copy the license, notices, disclaimer -->
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>plugin.xml</include>
-          <include>icons/*.*</include>
-        </includes>
-      </resource>
-    </resources>
+    <finalName>org.apache.uima.deployeditor_${parsedVersion.osgiVersion}</finalName>
 
     <plugins>
-      <!--plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <executions>
           <execution>
-            <id>bin</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
+            <id>uima-bundle</id>
             <configuration>
-              <descriptors>
-                <descriptor>
-                  src/main/assembly/assemble-plugin.xml</descriptor>
-              </descriptors>
-              <finalName>
-                org.apache.uima.deployeditor_${uimaj-release-eclipse-version}</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
+              <manifestLocation>META-INF</manifestLocation>
+              <instructions>
+                <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+                <_nouses>true</_nouses>
+                <Export-Package>
+                  org.apache.uima.dde.internal,
+                  org.apache.uima.dde.internal.details,
+                  org.apache.uima.dde.internal.hover,
+                  org.apache.uima.dde.internal.page,
+                  org.apache.uima.dde.internal.provider,
+                  org.apache.uima.dde.internal.wizards,
+                  org.apache.uima.editors.dde.internal,
+                  org.apache.uima.tools.images.internal,
+                  org.apache.uima.tools.internal.cde.uima.util,
+                  org.apache.uima.tools.internal.ui.forms,
+                  org.apache.uima.tools.internal.uima.util
+                </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)
+                -->
+                <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
+                </Require-Bundle>
+                <Import-Package>
+                  !org.eclipse.jface.text,
+                  !org.eclipse.jface.text,
+                  !org.eclipse.jface.text.link,
+                  !org.eclipse.jface.text.source,
+                  !org.eclipse.jface.text.templates,
+                  !org.eclipse.ui.texteditor,
+                  !org.eclipse.ui,
+                  !org.eclipse.ui.actions,
+                  !org.eclipse.ui.dialogs,
+                  !org.eclipse.ui.model,
+                  !org.eclipse.ui.part, 
+                  *,
+                  org.apache.uima.taeconfigurator.editors.ui.dialogs,
+                  org.apache.uima.taeconfigurator.files,
+                  org.apache.uima.application.util
+                </Import-Package>
+    
+                <!--Import-Package>*,
+                  org.eclipse.core.runtime,
+                  org.eclipse.core.runtime.jobs,
+                  org.eclipse.core.commands.common,
+                  org.eclipse.jface.operation,
+                  org.eclipse.jface.window,
+                  org.eclipse.jdt.launching,
+                  org.apache.uima.taeconfigurator.editors.ui.dialogs
+                </Import-Package-->
+    
+                <Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
+                <Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
+    
+                <Eclipse-LazyStart>true</Eclipse-LazyStart>
+              </instructions>
             </configuration>
           </execution>
         </executions>
-      </plugin-->
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <!-- version 1.4.0 to support _nouses instruction -->
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <manifestLocation>META-INF</manifestLocation>
-          <instructions>
-            <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
-            <_nouses>true</_nouses>
-            <Export-Package>
-              org.apache.uima.dde.internal,
-              org.apache.uima.dde.internal.details,
-              org.apache.uima.dde.internal.hover,
-              org.apache.uima.dde.internal.page,
-              org.apache.uima.dde.internal.provider,
-              org.apache.uima.dde.internal.wizards,
-              org.apache.uima.editors.dde.internal,
-              org.apache.uima.tools.images.internal,
-              org.apache.uima.tools.internal.cde.uima.util,
-              org.apache.uima.tools.internal.ui.forms,
-              org.apache.uima.tools.internal.uima.util
-            </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)
-            -->
-            <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
-            </Require-Bundle>
-            <Import-Package>
-              !org.eclipse.jface.text,
-              !org.eclipse.jface.text,
-              !org.eclipse.jface.text.link,
-              !org.eclipse.jface.text.source,
-              !org.eclipse.jface.text.templates,
-              !org.eclipse.ui.texteditor,
-              !org.eclipse.ui,
-              !org.eclipse.ui.actions,
-              !org.eclipse.ui.dialogs,
-              !org.eclipse.ui.model,
-              !org.eclipse.ui.part, 
-              *,
-              org.apache.uima.taeconfigurator.editors.ui.dialogs,
-              org.apache.uima.taeconfigurator.files,
-              org.apache.uima.application.util
-            </Import-Package>
-
-            <!--Import-Package>*,
-              org.eclipse.core.runtime,
-              org.eclipse.core.runtime.jobs,
-              org.eclipse.core.commands.common,
-              org.eclipse.jface.operation,
-              org.eclipse.jface.window,
-              org.eclipse.jdt.launching,
-              org.apache.uima.taeconfigurator.editors.ui.dialogs
-            </Import-Package-->
-
-            <Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
-            <Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
-
-            <Eclipse-LazyStart>true</Eclipse-LazyStart>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <manifest>.ignore</manifest>
-          <pde>true</pde>
-          <useProjectReferences>false</useProjectReferences>
-        </configuration>
       </plugin>
 
     </plugins>
diff --git a/uimaj-ep-runtime-deployeditor/pom.xml b/uimaj-ep-runtime-deployeditor/pom.xml
index 932240f..0fd4489 100644
--- a/uimaj-ep-runtime-deployeditor/pom.xml
+++ b/uimaj-ep-runtime-deployeditor/pom.xml
@@ -16,28 +16,55 @@
    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>
-  <groupId>org.apache.uima</groupId>
-  <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
-  <packaging>bundle</packaging>
-  <version>${uimaj-as-release-eclipse-version}</version>
-  <name>Apache UIMA Runtime Fragment for the Deployment Descriptor Editor Eclipse Plugin</name>
-  <url>http://incubator.apache.org/uima</url>
+  
   <parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>uimaj-as-eclipse-plugins</artifactId>
-    <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
-    <relativePath>../uimaj-as/eclipse-plugin-superPom</relativePath>
+    <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath/>
   </parent>
+
+  <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+  <packaging>jar</packaging>
+  <version>2.3.1-SNAPSHOT</version>
+  <name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
+  <description>Bundles the uima-as runtime parts needed for the deploy editor extension to the CDE, as a fragment on top of the main uima runtime</description>
+  <url>http://incubator.apache.org/uima</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 -->  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </developerConnection>
+    <url>
+      http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+    </url>
+  </scm>
+  
+  <properties>
+    <uimaScmRoot>uima-as</uimaScmRoot>
+    <uimaScmProject>${project.artifactId}</uimaScmProject>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-ep-runtime</artifactId>
-      <version>${uimaj-release-eclipse-version}</version>
+      <version>${project.version}</version>
       <!-- don't use provided scope here, because then
            eclipse:eclipse is set up to ref the uimaj-ep-runtime
            project directly, and it has no content
@@ -57,45 +84,35 @@
 
   <build>
 
-    <finalName>org.apache.uima.runtime.fragments.deployeditor_${uimaj-as-release-eclipse-version}</finalName>
-
+    <finalName>org.apache.uima.runtime.fragments.deployeditor_${parsedVersion.osgiVersion}</finalName>
     <plugins>
-
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <!-- version 1.4.0 to support _nouses instruction -->
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <manifestLocation>META-INF</manifestLocation>
-          <instructions>
-            <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
-            <_nouses>true</_nouses>
-            <Export-Package>
-              org.apache.uima.aae.deployment,
-              org.apache.uima.aae.deployment.impl,
-              org.apache.uima.application.metadata,
-              org.apache.uima.application.metadata.impl,
-              org.apache.uima.application.util,
-              org.apache.uima.cpe.model,
-              org.apache.uima.tools.debug.util
-            </Export-Package>
-
-            <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
-
-            <Fragment-Host>org.apache.uima.runtime;bundle-version="2.3.0"</Fragment-Host>
-          </instructions>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <manifest>.ignore</manifest>
-          <pde>true</pde>
-        </configuration>
+        <executions>
+          <execution>
+            <id>uima-bundle</id>
+            <configuration>
+              <instructions>
+                <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+                <_nouses>true</_nouses>
+                <Export-Package>
+                  org.apache.uima.aae.deployment,
+                  org.apache.uima.aae.deployment.impl,
+                  org.apache.uima.application.metadata,
+                  org.apache.uima.application.metadata.impl,
+                  org.apache.uima.application.util,
+                  org.apache.uima.cpe.model,
+                  org.apache.uima.tools.debug.util
+                </Export-Package>
+    
+                <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
+    
+                <Fragment-Host>org.apache.uima.runtime;bundle-version="${parsedVersion.osgiVersion}"</Fragment-Host>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>