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 2016/11/08 22:38:57 UTC
svn commit: r1768800 - in /uima/uimaj/branches/experiment-v3-jcas:
uimaj-ep-cas-editor-ide/ uimaj-ep-configurator/ uimaj-ep-debug/
uimaj-ep-jcasgen/ uimaj-ep-launcher/ uimaj-ep-pear-packager/
uimaj-ep-runtime/
Author: schor
Date: Tue Nov 8 22:38:57 2016
New Revision: 1768800
URL: http://svn.apache.org/viewvc?rev=1768800&view=rev
Log:
[UIMA-5172] do catch up merge for rest of projects from trunk. Includes lots of javadoc lint fixups, and some Jiras from 2.9.1
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-configurator/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-debug/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-jcasgen/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-pear-packager/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/ (props changed)
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor-ide/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -1,4 +1,4 @@
/uima/uimaj/branches/2.6.0-json/uimaj-ep-cas-editor-ide:1616936-1617592
/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-ep-cas-editor-ide:963167-964468
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor-ide:1436573-1462257
-/uima/uimaj/trunk/uimaj-ep-cas-editor-ide:1690273-1760085
+/uima/uimaj/trunk/uimaj-ep-cas-editor-ide:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-configurator/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-configurator:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:933273-944402
-/uima/uimaj/trunk/uimaj-ep-configurator:1690273-1760039
+/uima/uimaj/trunk/uimaj-ep-configurator:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-debug/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-debug:961329-961746
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-debug:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-debug:933273-944402
-/uima/uimaj/trunk/uimaj-ep-debug:1690273-1760086
+/uima/uimaj/trunk/uimaj-ep-debug:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-jcasgen:961329-961746
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-jcasgen:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:933273-944403
-/uima/uimaj/trunk/uimaj-ep-jcasgen:1690273-1760086
+/uima/uimaj/trunk/uimaj-ep-jcasgen:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-launcher/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -1,4 +1,4 @@
/uima/uimaj/branches/2.6.0-json/uimaj-ep-launcher:1616936-1617592
/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-ep-launcher:963167-964468
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-launcher:1436573-1462257
-/uima/uimaj/trunk/uimaj-ep-launcher:1690273-1760089
+/uima/uimaj/trunk/uimaj-ep-launcher:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-pear-packager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-pear-packager:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-pear-packager:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager:933273-944403
-/uima/uimaj/trunk/uimaj-ep-pear-packager:1690273-1760086
+/uima/uimaj/trunk/uimaj-ep-pear-packager:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:38:57 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-runtime:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-runtime:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime:933273-944403
-/uima/uimaj/trunk/uimaj-ep-runtime:1690273-1760086
+/uima/uimaj/trunk/uimaj-ep-runtime:1690273-1768794