You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/06/18 15:11:00 UTC

svn commit: r955994 - in /uima/build/trunk: aggregate-parent-poms/pom.xml parent-poms/parent-pom-distr/pom.xml parent-poms/parent-pom-docbook/pom.xml parent-poms/parent-pom-top/pom.xml uima-docbook-resource-bundle/pom.xml uima-jar-resource-bundle/pom.xml

Author: schor
Date: Fri Jun 18 13:11:00 2010
New Revision: 955994

URL: http://svn.apache.org/viewvc?rev=955994&view=rev
Log:
[UIMA-1815 UIMA-1814] add relativePath to top pom, and make top pom use 2.0 version of release plugin, and set pom dependency versions for top pom to 2-SNAPSHOT in prep for release

Modified:
    uima/build/trunk/aggregate-parent-poms/pom.xml
    uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
    uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
    uima/build/trunk/parent-poms/parent-pom-top/pom.xml
    uima/build/trunk/uima-docbook-resource-bundle/pom.xml
    uima/build/trunk/uima-jar-resource-bundle/pom.xml

Modified: uima/build/trunk/aggregate-parent-poms/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=955994&r1=955993&r2=955994&view=diff
==============================================================================
--- uima/build/trunk/aggregate-parent-poms/pom.xml (original)
+++ uima/build/trunk/aggregate-parent-poms/pom.xml Fri Jun 18 13:11:00 2010
@@ -26,8 +26,8 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom-top</artifactId>
-    <version>1</version>
-    <relativePath/>
+    <version>2-SNAPSHOT</version>
+    <relativePath>../parent-pom-top</relativePath>
   </parent>
   
 	<artifactId>aggregate-parent-poms</artifactId>
@@ -64,7 +64,7 @@
     
   <modules>
     <!-- can't build the top, because this pom depends on it as a parent -->
-    <!--module>../parent-poms/parent-pom-top</module-->
+    <module>../parent-poms/parent-pom-top</module>
       <module>../parent-poms/parent-pom-docbook</module>
         <module>../parent-poms/parent-pom-ibm-notice</module>
         <module>../parent-poms/parent-pom-eclipse-plugins</module>

Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=955994&r1=955993&r2=955994&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Fri Jun 18 13:11:00 2010
@@ -29,8 +29,8 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom-top</artifactId>
-    <version>1</version>
-    <relativePath/>
+    <version>2-SNAPSHOT</version>
+    <relativePath>../parent-pom-top</relativePath>
   </parent>
 
   <artifactId>parent-pom-distr</artifactId>

Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=955994&r1=955993&r2=955994&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Fri Jun 18 13:11:00 2010
@@ -30,8 +30,8 @@
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom-top</artifactId>
-    <version>1</version>
-    <relativePath/>
+    <version>2-SNAPSHOT</version>
+    <relativePath>../parent-pom-top</relativePath>
   </parent>
 
   <artifactId>parent-pom-docbook</artifactId>

Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=955994&r1=955993&r2=955994&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Fri Jun 18 13:11:00 2010
@@ -439,6 +439,19 @@
           </executions>
         </plugin>
         
+        <!-- set release-plugin version to 2.0,
+             needed for "flat" hierarchy support -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0</version>         
+          <configuration>
+            <useReleaseProfile>false</useReleaseProfile>
+            <goals>deploy</goals>
+            <arguments>-Papache-release</arguments>
+          </configuration>
+        </plugin>
+       
       </plugins>
     </pluginManagement>
     

Modified: uima/build/trunk/uima-docbook-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-resource-bundle/pom.xml?rev=955994&r1=955993&r2=955994&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-resource-bundle/pom.xml (original)
+++ uima/build/trunk/uima-docbook-resource-bundle/pom.xml Fri Jun 18 13:11:00 2010
@@ -22,8 +22,8 @@
   <parent>
     <artifactId>parent-pom-top</artifactId>
     <groupId>org.apache.uima</groupId>
-    <version>1</version>
-    <relativePath/>
+    <version>2-SNAPSHOT</version>
+    <relativePath>../parent-pom-top</relativePath>
   </parent>
   
   <artifactId>uima-docbook-resource-bundle</artifactId>

Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/pom.xml?rev=955994&r1=955993&r2=955994&view=diff
==============================================================================
--- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original)
+++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Fri Jun 18 13:11:00 2010
@@ -22,8 +22,8 @@
   <parent>
     <artifactId>parent-pom-top</artifactId>
     <groupId>org.apache.uima</groupId>
-    <version>1</version>
-    <relativePath/>
+    <version>2-SNAPSHOT</version>
+    <relativePath>../parent-pom-top</relativePath>
   </parent>
   
   <artifactId>uima-jar-resource-bundle</artifactId>