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/07/08 15:36:25 UTC
svn commit: r961762 - in /uima/uima-as/trunk:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-distr/
uima-as-docbooks/ uimaj-as-activemq/ uimaj-as-camel/ uimaj-as-core/
uimaj-as-jms/ uimaj-as-osgi-runtime/ uimaj-eclipse-feature-deployedit...
Author: schor
Date: Thu Jul 8 13:36:25 2010
New Revision: 961762
URL: http://svn.apache.org/viewvc?rev=961762&view=rev
Log:
[UIMA-1832] merge branch -> trunk to update dependencies to parent-pom-top version 4
Modified:
uima/uima-as/trunk/aggregate-uima-as/ (props changed)
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/ (props changed)
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/trunk/aggregate-uima-as/pom.xml
uima/uima-as/trunk/uima-as-distr/ (props changed)
uima/uima-as/trunk/uima-as-docbooks/ (props changed)
uima/uima-as/trunk/uimaj-as-activemq/ (props changed)
uima/uima-as/trunk/uimaj-as-camel/ (props changed)
uima/uima-as/trunk/uimaj-as-core/ (props changed)
uima/uima-as/trunk/uimaj-as-jms/ (props changed)
uima/uima-as/trunk/uimaj-as-osgi-runtime/ (props changed)
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/ (props changed)
uima/uima-as/trunk/uimaj-ep-deployeditor/ (props changed)
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/ (props changed)
Propchange: uima/uima-as/trunk/aggregate-uima-as/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as:961335-961760
/uima/uima-as/branches/mavenAlign/aggregate-uima-as:944306-944449
Propchange: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/aggregate-uima-as-eclipse-plugins:961335-961760
/uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins:944306-944449
Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=961762&r1=961761&r2=961762&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Thu Jul 8 13:36:25 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>2</version>
+ <version>4</version>
<relativePath/>
</parent>
Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=961762&r1=961761&r2=961762&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Thu Jul 8 13:36:25 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>2</version>
+ <version>4</version>
<relativePath/>
</parent>
Propchange: uima/uima-as/trunk/uima-as-distr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uima-as-distr:961335-961761
/uima/uima-as/branches/mavenAlign/uima-as-distr:941450-944449
Propchange: uima/uima-as/trunk/uima-as-docbooks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uima-as-docbooks:961335-961760
/uima/uima-as/branches/mavenAlign/uima-as-docbooks:941450-944455
Propchange: uima/uima-as/trunk/uimaj-as-activemq/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-activemq:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-as-activemq:941450-944450
Propchange: uima/uima-as/trunk/uimaj-as-camel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-camel:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-as-camel:941450-944450
Propchange: uima/uima-as/trunk/uimaj-as-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-core:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-as-core:941450-944450
Propchange: uima/uima-as/trunk/uimaj-as-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-jms:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-as-jms:941450-944450
Propchange: uima/uima-as/trunk/uimaj-as-osgi-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-as-osgi-runtime:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime:941450-944450
Propchange: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-deployeditor:961335-961761
Propchange: uima/uima-as/trunk/uimaj-ep-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-ep-deployeditor:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-ep-deployeditor:941450-944450
Propchange: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 13:36:25 2010
@@ -1 +1,2 @@
+/uima/uima-as/branches/depend-on-parent-pom-4/uimaj-ep-runtime-deployeditor:961335-961760
/uima/uima-as/branches/mavenAlign/uimaj-ep-runtime-deployeditor:941450-944450