Author: schor
Date: Sun Jul 15 01:23:41 2018
New Revision: 1835940
URL: http://svn.apache.org/viewvc?rev=1835940&view=rev
Log:
[UIMA-5730] merge from trunk
Added:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java
- copied unchanged from r1835939,
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/pearTests/analysisEngineWithParameters.pear
- copied unchanged from r1835939,
uima/uimaj/trunk/uimaj-core/src/test/resources/pearTests/analysisEngineWithParameters.pear
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/
(props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/pearTests/ (props
changed)
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 15 01:23:41 2018
@@ -4,4 +4,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl:933273-944396
-/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl:1690273-1779683,1781464,1781560,1782182,1782473-1782820,1782840
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl:1690273-1835939
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/pearTests/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jul 15 01:23:41 2018
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/resources/pearTests:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/resources/pearTests:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/resources/pearTests:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/resources/pearTests:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/resources/pearTests:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/resources/pearTests:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/resources/pearTests:1690273-1835939
