Author: schor
Date: Thu Jul 8 12:50:53 2010
New Revision: 961743
URL: http://svn.apache.org/viewvc?rev=961743&view=rev
Log:
[UIMA-1832] merge trunk -> branch (picked up on change in cas editor :
AnnotationStyleTest - but diff shows no diff except white space maybe)
Modified:
uima/uimaj/branches/depend-on-parent-pom-4/PearPackagingMavenPlugin/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/jVinci/ (props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-overview-and-setup/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-references/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-tools/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-tutorials-and-users-guides/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-adapter-soap/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-adapter-vinci/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/ (props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-cpe/ (props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-distr/ (props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-document-annotation/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-tools/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-update-site/
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-cas-editor/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java
(props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-configurator/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-debug/ (props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-jcasgen/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-pear-packager/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-runtime/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-examples/ (props changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-internal-tools/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-test-util/ (props
changed)
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/ (props changed)
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/PearPackagingMavenPlugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin:932400-933272
/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin:933273-944394
+/uima/uimaj/trunk/PearPackagingMavenPlugin:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1 +1,2 @@
/uima/uimaj/branches/mavenAlign/aggregate-uimaj:944252
+/uima/uimaj/trunk/aggregate-uimaj:961329-961737
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-docbooks/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/trunk/aggregate-uimaj-docbooks:961329-961738
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/aggregate-uimaj-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1 +1,2 @@
/uima/uimaj/branches/mavenAlign/aggregate-uimaj-eclipse-plugins:944252
+/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins:961329-961740
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/jVinci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/jVinci:932400-933272
/uima/uimaj/branches/mavenAlign/jVinci:933273-944394
+/uima/uimaj/trunk/jVinci:961329-961740
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-overview-and-setup/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1 +1,2 @@
/uima/uimaj/branches/mavenAlign/uima-docbook-overview-and-setup:944252
+/uima/uimaj/trunk/uima-docbook-overview-and-setup:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-references/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1 +1,2 @@
/uima/uimaj/branches/mavenAlign/uima-docbook-references:944251-944252
+/uima/uimaj/trunk/uima-docbook-references:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1 +1,2 @@
/uima/uimaj/branches/mavenAlign/uima-docbook-tools:944252
+/uima/uimaj/trunk/uima-docbook-tools:961329-961738
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-tutorials-and-users-guides/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1 +1,2 @@
/uima/uimaj/branches/mavenAlign/uima-docbook-tutorials-and-users-guides:944252
+/uima/uimaj/trunk/uima-docbook-tutorials-and-users-guides:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-adapter-soap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-adapter-soap:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-adapter-soap:933273-944394
+/uima/uimaj/trunk/uimaj-adapter-soap:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-adapter-vinci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci:933273-944395
+/uima/uimaj/trunk/uimaj-adapter-vinci:961329-961740
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-bootstrap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-bootstrap:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-bootstrap:933273-944396
+/uima/uimaj/trunk/uimaj-bootstrap:961329-961739
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-component-test-util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-component-test-util:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-component-test-util:933273-944396
+/uima/uimaj/trunk/uimaj-component-test-util:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-core:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-core:933273-944396
+/uima/uimaj/trunk/uimaj-core:961329-961737
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-cpe/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-cpe:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-cpe:933273-944399
+/uima/uimaj/trunk/uimaj-cpe:961329-961740
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-distr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-distr:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-distr:933273-944399
+/uima/uimaj/trunk/uimaj-distr:961329-961739
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-document-annotation/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-document-annotation:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-document-annotation:933273-944399
+/uima/uimaj/trunk/uimaj-document-annotation:961329-961737
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime:933273-944399
+/uima/uimaj/trunk/uimaj-eclipse-feature-runtime:961329-961739
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools:933273-944402
+/uima/uimaj/trunk/uimaj-eclipse-feature-tools:961329-961739
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site:933273-944402
+/uima/uimaj/trunk/uimaj-eclipse-update-site:961329-961740
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-cas-editor/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uimaj/trunk/uimaj-ep-cas-editor:961329-961738
Propchange:
uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-cas-editor/src/test/java/org/apache/uima/caseditor/editor/AnnotationStyleTest.java
('svn:mergeinfo' removed)
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-configurator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:933273-944402
+/uima/uimaj/trunk/uimaj-ep-configurator:961329-961738
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-debug/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-debug:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-ep-debug:933273-944402
+/uima/uimaj/trunk/uimaj-ep-debug:961329-961740
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:933273-944403
+/uima/uimaj/trunk/uimaj-ep-jcasgen:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-pear-packager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager:933273-944403
+/uima/uimaj/trunk/uimaj-ep-pear-packager:961329-961738
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime:933273-944403
+/uima/uimaj/trunk/uimaj-ep-runtime:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-examples:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-examples:933273-944403
+/uima/uimaj/trunk/uimaj-examples:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-internal-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-internal-tools:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-internal-tools:933273-944403
+/uima/uimaj/trunk/uimaj-internal-tools:961329-961739
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-test-util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-test-util:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-test-util:933273-944404
+/uima/uimaj/trunk/uimaj-test-util:961329-961738
Propchange: uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 8 12:50:53 2010
@@ -1,2 +1,3 @@
/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools:932400-933272
/uima/uimaj/branches/mavenAlign/uimaj-tools:933273-944404
+/uima/uimaj/trunk/uimaj-tools:961329-961739
