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 2011/08/18 20:11:35 UTC

svn commit: r1159336 - /uima/uimaj/trunk/src/

Author: schor
Date: Thu Aug 18 18:11:34 2011
New Revision: 1159336

URL: http://svn.apache.org/viewvc?rev=1159336&view=rev
Log:
[UIMA-1967] move uimaj project up one level; merge uimaj-distr into it.  Change uimaj-parent to use version 3-SNAPSHOT of the UIMA -wide parent.  (This will be converted to version 3 once we release build parent-pom at that level).

Added:
    uima/uimaj/trunk/src/   (props changed)
      - copied from r1159335, uima/uimaj/trunk/uimaj-distr/src/

Propchange: uima/uimaj/trunk/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 18 18:11:34 2011
@@ -0,0 +1,4 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-distr/src:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-distr/src:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-distr/src:961329-961745
+/uima/uimaj/branches/mavenAlign/uimaj-distr/src:933273-944399