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/09/08 13:45:54 UTC

svn commit: r1759824 - in /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test: java/org/apache/uima/cas/test/FeatureStructureTest.java java/org/apache/uima/cas/test/SerializationReinitTest.java resources/ExampleCas/testTypeSystem_variation.xml

Author: schor
Date: Thu Sep  8 13:45:53 2016
New Revision: 1759824

URL: http://svn.apache.org/viewvc?rev=1759824&view=rev
Log:
no jira merge catchup

Added:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_variation.xml
      - copied unchanged from r1756658, uima/uimaj/trunk/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_variation.xml
Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java   (props changed)
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java   (props changed)

Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep  8 13:45:53 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java:1690273-1759822

Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  8 13:45:53 2016
@@ -4,4 +4,4 @@
 /uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java:961329-961745
 /uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java:1436573-1462257
 /uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java:933273-944396
-/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java:1690273-1758956
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java:1690273-1759822