Author: schor
Date: Thu Jul 8 12:39:21 2010
New Revision: 961737
URL: http://svn.apache.org/viewvc?rev=961737&view=rev
Log:
[UIMA-1832] merge branch -> trunk to update dependencies to parent-pom-top
version 4
Modified:
uima/build/trunk/aggregate-parent-poms/ (props changed)
uima/build/trunk/aggregate-parent-poms/pom.xml
uima/build/trunk/parent-poms/parent-pom-annotator/ (props changed)
uima/build/trunk/parent-poms/parent-pom-distr/ (props changed)
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/ (props changed)
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/ (props changed)
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/
(props changed)
uima/build/trunk/parent-poms/parent-pom-ibm-notice/ (props changed)
uima/build/trunk/parent-poms/parent-pom-single-project/ (props changed)
uima/build/trunk/parent-poms/parent-pom-top/ (props changed)
uima/build/trunk/uima-assembly-single-project/ (props changed)
uima/build/trunk/uima-assembly-single-project/pom.xml
uima/build/trunk/uima-build-helper-maven-plugin/ (props changed)
uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
uima/build/trunk/uima-docbook-olink/ (props changed)
uima/build/trunk/uima-docbook-olink/pom.xml
uima/build/trunk/uima-docbook-resource-bundle/ (props changed)
uima/build/trunk/uima-docbook-resource-bundle/pom.xml
uima/build/trunk/uima-jar-resource-bundle/ (props changed)
uima/build/trunk/uima-jar-resource-bundle/pom.xml
Propchange: uima/build/trunk/aggregate-parent-poms/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/aggregate-parent-poms:961327-961736
Modified: uima/build/trunk/aggregate-parent-poms/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/aggregate-parent-poms/pom.xml (original)
+++ uima/build/trunk/aggregate-parent-poms/pom.xml Thu Jul 8 12:39:21 2010
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-poms/parent-pom-top</relativePath>
</parent>
Propchange: uima/build/trunk/parent-poms/parent-pom-annotator/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-annotator:961327-961736
Propchange: uima/build/trunk/parent-poms/parent-pom-distr/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-distr:961327-961736
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=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Thu Jul 8 12:39:21
2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-pom-top</relativePath>
</parent>
Propchange: uima/build/trunk/parent-poms/parent-pom-docbook/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-docbook:961327-961736
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=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Thu Jul 8 12:39:21
2010
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-pom-top</relativePath>
</parent>
Propchange: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-eclipse-plugins:961327-961736
Propchange: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-eclipse-plugins-ibm-notice:961327-961736
Propchange: uima/build/trunk/parent-poms/parent-pom-ibm-notice/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-ibm-notice:961327-961736
Propchange: uima/build/trunk/parent-poms/parent-pom-single-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-single-project:961327-961736
Propchange: uima/build/trunk/parent-poms/parent-pom-top/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/parent-poms/parent-pom-top:961327-961736
Propchange: uima/build/trunk/uima-assembly-single-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/uima-assembly-single-project:961327-961736
Modified: uima/build/trunk/uima-assembly-single-project/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/uima-assembly-single-project/pom.xml (original)
+++ uima/build/trunk/uima-assembly-single-project/pom.xml Thu Jul 8 12:39:21
2010
@@ -52,7 +52,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-poms/parent-pom-top</relativePath>
</parent>
Propchange: uima/build/trunk/uima-build-helper-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/uima-build-helper-maven-plugin:961327-961736
Modified: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/uima-build-helper-maven-plugin/pom.xml (original)
+++ uima/build/trunk/uima-build-helper-maven-plugin/pom.xml Thu Jul 8 12:39:21
2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-poms/parent-pom-top</relativePath>
</parent>
Propchange: uima/build/trunk/uima-docbook-olink/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/uima-docbook-olink:961327-961736
Modified: uima/build/trunk/uima-docbook-olink/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/pom.xml?rev=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-olink/pom.xml (original)
+++ uima/build/trunk/uima-docbook-olink/pom.xml Thu Jul 8 12:39:21 2010
@@ -22,7 +22,7 @@
<parent>
<artifactId>parent-pom-top</artifactId>
<groupId>org.apache.uima</groupId>
- <version>2</version>
+ <version>4</version>
<relativePath/>
</parent>
Propchange: uima/build/trunk/uima-docbook-resource-bundle/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/uima-docbook-resource-bundle:961327-961736
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=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-resource-bundle/pom.xml (original)
+++ uima/build/trunk/uima-docbook-resource-bundle/pom.xml Thu Jul 8 12:39:21
2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-poms/parent-pom-top</relativePath>
</parent>
Propchange: uima/build/trunk/uima-jar-resource-bundle/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 12:39:21 2010
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-parent-pom-4/uima-jar-resource-bundle:961327-961736
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=961737&r1=961736&r2=961737&view=diff
==============================================================================
--- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original)
+++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Thu Jul 8 12:39:21 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<relativePath>../parent-poms/parent-pom-top</relativePath>
</parent>
