Author: schor
Date: Wed Oct 17 19:09:04 2018
New Revision: 1844150
URL: http://svn.apache.org/viewvc?rev=1844150&view=rev
Log:
[UIMA-5753] fixes to build with Java 11
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java
(props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
(contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java
(contents, props changed)
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
Wed Oct 17 19:09:04 2018
@@ -34,7 +34,6 @@ and exception classes.</p>
<code>TextAnnotator</code>, but uses the Java-object-based {@link
org.apache.uima.jcas.JCas}
interface instead of the standard {@link org.apache.uima.cas.CAS}
interface. </li>
</ul>
-</p>
</body>
</html>
\ No newline at end of file
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html:1690273-1844144
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
Wed Oct 17 19:09:04 2018
@@ -23,7 +23,7 @@ package org.apache.uima.cas;
* The interface that describes features in the type system.
*
* <p>
- * <a name="names">Feature short or base names</a> are <a
href="./Type.html#identifiers"> type
+ * <a id="names">Feature short or base names</a> are <a
href="./Type.html#identifiers"> type
* system identifiers</a>. The (fully) qualified name of a feature is the <a
* href="./Type.html#names">name</a> of the type it is defined on, followed by
a colon, followed by
* the its short name. For example, the qualified name of the Annotation begin
feature is
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Feature.java:1690273-1844138
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
Wed Oct 17 19:09:04 2018
@@ -28,14 +28,14 @@ import org.apache.uima.cas.impl.TypeImpl
* The interface describing types in the type system.
*
* <p>
- * <a name="names">Type names</a> are Java strings that look like Java class
names. For example,
+ * <a id="names">Type names</a> are Java strings that look like Java class
names. For example,
* the built-in annotation type is called <code>uima.tcas.Annotation</code>.
The whole string is
* called the (fully) qualified type name. The part after the last period is
called the short or
* base name. The rest of the name is the name space of the type. This part
can be empty, in which
* case the qualified and the base name are identical.
*
* <p>
- * <a name="identifiers">Type system identifiers</a> in general have the
following syntax: they are
+ * <a id="identifiers">Type system identifiers</a> in general have the
following syntax: they are
* non-empty strings whose first character is a letter (Unicode letter),
followed by an arbitrary
* sequence of letters, digits and underscores. No other characters are legal
parts of identifiers.
* A type name is then a non-empty sequence of identifiers separated by
periods. See also <a
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java:1690273-1844138
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html
Wed Oct 17 19:09:04 2018
@@ -30,7 +30,7 @@
<body>
<h1>Implementation and Low-Level API for the CAS Interfaces.</h1>
<p>These are Internal APIs. Use these APIs at your own risk. APIs in this
package are subject to change without notice, even in minor releases. Use of
this package is not supported. If you think you have found a bug in this
package, please try to reproduce it with the officially supported APIs before
reporting it.</p>
-<hr />
+<hr>
<h1>Internals documentation</h1>
<p>NOTE: This documentation is plain HTML, generated from a WYSIWIG editor
"tinymce". The way to work on this: after setting up a small
web page with the tinymce (running from a local file), use the Tools - source
code to cut/paste between this file's source and that editor.</p>
<h2>Java Cover Objects for version 3</h2>
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html
Wed Oct 17 19:09:04 2018
@@ -50,11 +50,12 @@
<h2>Built-in Feature Structure classes</h2>
<p>This package holds the definition for many of the built-in Feature
Structures.</p>
<p>The following classes are alternate interfaces for built-in Feature
Structures; they remain for backwards compatibility.org.apache.uima.cas</p>
-<table style="height: 247px;" border="1" width="307" cellpadding="2">
+<table style="height: 247px;" border="1" >
+<caption>alternate interfaces</caption>
<tbody>
<tr>
-<td style="text-align: center;">UIMA v2 name<br />org.apache.uima.cas</td>
-<td style="text-align: center;">preferred<br />org.apache.uima.jcas.cas</td>
+<td style="text-align: center;">UIMA v2 name<br>org.apache.uima.cas</td>
+<td style="text-align: center;">preferred<br>org.apache.uima.jcas.cas</td>
</tr>
<tr>
<td>BooleanArrayFS</td>
@@ -111,6 +112,7 @@
<h2>Exception collections</h2>
<p>Many of the exceptions that UIMA may throw are collected into groups here.
These classes provide one level of indirection that permit IDE environments to
conveniently locate and work with these.</p>
<table>
+<caption>exceptions</caption>
<tbody>
<tr>
<td> </td>
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/package.html:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/cas/package.html:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/cas/package.html:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/cas/package.html:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/cas/package.html:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/package.html:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/cas/package.html:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/package.html:1690273-1844138
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
Wed Oct 17 19:09:04 2018
@@ -28,7 +28,7 @@ The <CODE>org.apache.uima.pear.tools</CO
and tools that allow installing PEAR packages containing UIMA-compliant
components, verifying serviceability of installed components by using
UIMA API and browsing PEAR packages.
-<br />
+<br>
</BODY>
</HTML>
\ No newline at end of file
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/package.html:1690273-1844142
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
Wed Oct 17 19:09:04 2018
@@ -27,7 +27,7 @@
The <CODE>org.apache.uima.pear.util</CODE> package provides utilities that
facilitate common operations with general files, strings and XML files,
as well as simple process message routing and other useful operations.
-<br />
+<br>
</BODY>
</HTML>
\ No newline at end of file
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/package.html:1690273-1844142
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java:1690273-1844135
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
Wed Oct 17 19:09:04 2018
@@ -1643,7 +1643,7 @@ public class AnalysisEngine_implTest ext
// Write out descriptor
File cloneFile = new File(inFile.getParentFile(),
"CopyOfAggregateWithManyDelegates.xml");
BufferedOutputStream os = new BufferedOutputStream(new
FileOutputStream(cloneFile));
- XMLSerializer xmlSerializer = new XMLSerializer(true);
+ XMLSerializer xmlSerializer = new XMLSerializer(false);
xmlSerializer.setOutputStream(os);
// set the amount to a value which will show up if used
// indent should not be used because we're using a parser mode which
preserves
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -4,4 +4,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:933273-944396
-/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:1690273-1807392
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java:1690273-1844138
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java?rev=1844150&r1=1844149&r2=1844150&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java
Wed Oct 17 19:09:04 2018
@@ -21,7 +21,6 @@ package org.apache.uima.util;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.uima.UIMAFramework;
@@ -38,6 +37,7 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.testTypeSystem_arrays.OfShorts;
import org.apache.uima.testTypeSystem_arrays.OfStrings;
import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
import junit.framework.TestCase;
@@ -155,7 +155,14 @@ public class CasToInlineXmlTest extends
break;
}
}
- XMLAssert.assertXMLEqual(expected, result);
+ boolean whitespaceFlag = XMLUnit.getIgnoreWhitespace();
+ XMLUnit.setIgnoreWhitespace(true);
+ try {
+ XMLAssert.assertXMLEqual(expected, result);
+ }
+ finally {
+ XMLUnit.setIgnoreWhitespace(whitespaceFlag);
+ }
// assertEquals(expected, result.trim());
}
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 17 19:09:04 2018
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasToInlineXmlTest.java:1690273-1844137
