svn commit: r983669 - in /uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor: feature.xml pom.xml

[sc...@apache.org]

Author: schor
Date: Mon Aug  9 15:02:05 2010
New Revision: 983669

URL: http://svn.apache.org/viewvc?rev=983669&view=rev
Log:
[UIMA-1854] feature project feature.xml: upgrade from 2.3.0.incubating to 2.3.1.SNAPSHOT.

feature project pom.xml: conform to standard layout, correct parent, add missing parts, correct <finalName> to make use of automatically generated osgi version

Modified:
    uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.xml
    uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml

Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.xml?rev=983669&r1=983668&r2=983669&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.xml Mon Aug  9 15:02:05 2010
@@ -20,7 +20,7 @@
 <feature
       id="org.apache.uima.as.deployeditor"
       label="UIMA-AS Deployment Descriptor Editor"
-      version="2.3.0.incubating"
+      version="2.3.1.SNAPSHOT"
       provider-name="Apache Software Foundation">
 
    <description url="http://incubator.apache.org/uima">
@@ -30,7 +30,7 @@
       UIMA components using Asynchronous Scaleout
    </description>
 
-   <copyright url="http://incubator.apache.org/uima">
+   <copyright url="http://www.apache.org/licenses/LICENSE-2.0">
       Copyright the Apache Software Foundation and others; see License
 and NOTICE files
    </copyright>
@@ -53,7 +53,7 @@ under the License.
    </license>
 
    <url>
-      <discovery label="UIMA Eclipse Plugins update site" url="http://www.apache.org/dist/incubator/uima/eclipse-update-site/"/>
+      <discovery label="UIMA Eclipse Plugins update site" url="http://www.apache.org/dist/uima/eclipse-update-site/"/>
    </url>
 
    <requires>
@@ -65,14 +65,14 @@ under the License.
          id="org.apache.uima.deployeditor"
          download-size="0"
          install-size="0"
-         version="2.3.0.incubating"
+         version="2.3.1.SNAPSHOT"
          unpack="false"/>
 
    <plugin
          id="org.apache.uima.runtime.fragments.deployeditor"
          download-size="0"
          install-size="0"
-         version="2.3.0.incubating"
+         version="2.3.1.SNAPSHOT"
          fragment="true"
          unpack="false"/>
 

Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml?rev=983669&r1=983668&r2=983669&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Mon Aug  9 15:02:05 2010
@@ -20,19 +20,49 @@
 <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>4</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 the uima-as deploy 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 -->  
+  <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>
+    <!-- parsedVersion set in parent-pom-top by builder-helper -->    
+    <finalName>org.apache.uima.as.deployeditor_${parsedVersion.osgiVersion}</finalName>
     <resources>
       <resource>
         <directory>.</directory>