Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -39,41 +39,41 @@ From: 'The Apache Software Foundation' (http://jakarta.apache.org)
    License: The Apache Software License, Version 2.0  (/LICENSE.txt)

 From: 'The Apache Software Foundation' (http://www.apache.org/)
-  - Apache UIMA Base: jVinci: Vinci Transport Library (http://uima.apache.org) org.apache.uima:jVinci:jar:2.10.1
+  - Apache UIMA Base: jVinci: Vinci Transport Library (http://uima.apache.org) org.apache.uima:jVinci:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-adapter-soap: SOAP Adapter (http://uima.apache.org) org.apache.uima:uimaj-adapter-soap:jar:2.10.1
+  - Apache UIMA Base: uimaj-adapter-soap: SOAP Adapter (http://uima.apache.org) org.apache.uima:uimaj-adapter-soap:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-adapter-vinci: Vinci Adapter (http://uima.apache.org) org.apache.uima:uimaj-adapter-vinci:jar:2.10.1
+  - Apache UIMA Base: uimaj-adapter-vinci: Vinci Adapter (http://uima.apache.org) org.apache.uima:uimaj-adapter-vinci:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-bootstrap (http://uima.apache.org) org.apache.uima:uimaj-bootstrap:jar:2.10.1
+  - Apache UIMA Base: uimaj-bootstrap (http://uima.apache.org) org.apache.uima:uimaj-bootstrap:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-core (http://uima.apache.org) org.apache.uima:uimaj-core:jar:2.10.1
+  - Apache UIMA Base: uimaj-core (http://uima.apache.org) org.apache.uima:uimaj-core:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-cpe: Collection Processing Engine (http://uima.apache.org) org.apache.uima:uimaj-cpe:jar:2.10.1
+  - Apache UIMA Base: uimaj-cpe: Collection Processing Engine (http://uima.apache.org) org.apache.uima:uimaj-cpe:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-document-annotation (http://uima.apache.org) org.apache.uima:uimaj-document-annotation:jar:2.10.1
+  - Apache UIMA Base: uimaj-document-annotation (http://uima.apache.org) org.apache.uima:uimaj-document-annotation:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-cas-editor (http://uima.apache.org) org.apache.uima:uimaj-ep-cas-editor:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-cas-editor (http://uima.apache.org) org.apache.uima:uimaj-ep-cas-editor:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-cas-editor-ide (http://uima.apache.org) org.apache.uima:uimaj-ep-cas-editor-ide:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-cas-editor-ide (http://uima.apache.org) org.apache.uima:uimaj-ep-cas-editor-ide:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-configurator: Descriptor Editor (http://uima.apache.org) org.apache.uima:uimaj-ep-configurator:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-configurator: Descriptor Editor (http://uima.apache.org) org.apache.uima:uimaj-ep-configurator:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-debug (http://uima.apache.org) org.apache.uima:uimaj-ep-debug:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-debug (http://uima.apache.org) org.apache.uima:uimaj-ep-debug:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-jcasgen (http://uima.apache.org) org.apache.uima:uimaj-ep-jcasgen:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-jcasgen (http://uima.apache.org) org.apache.uima:uimaj-ep-jcasgen:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-launcher (http://uima.apache.org) org.apache.uima:uimaj-ep-launcher:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-launcher (http://uima.apache.org) org.apache.uima:uimaj-ep-launcher:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-pear-packager (http://uima.apache.org) org.apache.uima:uimaj-ep-pear-packager:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-pear-packager (http://uima.apache.org) org.apache.uima:uimaj-ep-pear-packager:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Eclipse: uimaj-ep-runtime (http://uima.apache.org) org.apache.uima:uimaj-ep-runtime:jar:2.10.1
+  - Apache UIMA Eclipse: uimaj-ep-runtime (http://uima.apache.org) org.apache.uima:uimaj-ep-runtime:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-examples: SDK Examples (http://uima.apache.org) org.apache.uima:uimaj-examples:jar:2.10.1
+  - Apache UIMA Base: uimaj-examples: SDK Examples (http://uima.apache.org) org.apache.uima:uimaj-examples:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-json: JSON (http://uima.apache.org/uimaj-json) org.apache.uima:uimaj-json:jar:2.10.1
+  - Apache UIMA Base: uimaj-json: JSON (http://uima.apache.org/uimaj-json) org.apache.uima:uimaj-json:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
-  - Apache UIMA Base: uimaj-tools: Tools (http://uima.apache.org) org.apache.uima:uimaj-tools:jar:2.10.1
+  - Apache UIMA Base: uimaj-tools: Tools (http://uima.apache.org) org.apache.uima:uimaj-tools:jar:2.10.2
    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)



--- a/PearPackagingMavenPlugin/pom.xml
+++ b/PearPackagingMavenPlugin/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.uima</groupId>
    <artifactId>uimaj-parent</artifactId>
-    <version>2.10.1</version>
+    <version>2.10.2</version>
    <relativePath>../uimaj-parent/pom.xml</relativePath>
  </parent>
  
@@ -44,13 +44,13 @@
       element, and just changing the following two properties -->  
  <scm>
    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/PearPackagingMavenPlugin
+      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/PearPackagingMavenPlugin
    </connection>
    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/PearPackagingMavenPlugin
+      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/PearPackagingMavenPlugin
    </developerConnection>
    <url>
-      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.1/PearPackagingMavenPlugin
+      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.2/PearPackagingMavenPlugin
    </url>
  </scm>
  

--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -20,10 +20,10 @@
   -->
 <html>
 <head>
-  <title>Apache UIMA v2.10.1 Release Notes</title>
+  <title>Apache UIMA v2.10.2 Release Notes</title>
 </head>
 <body>
-<h1>Apache UIMA (Unstructured Information Management Architecture) v2.10.1 Release Notes</h1>
+<h1>Apache UIMA (Unstructured Information Management Architecture) v2.10.2 Release Notes</h1>

 <h2>Contents</h2>
 <p>
@@ -82,11 +82,12 @@
 <h2><a id="major.changes">Major Changes in this Release</a></h2>
 <p>The major changes in this release include:</p>

-<ul><li>https://issues.apache.org/jira/browse/UIMA-5411 - for external override values,
-make the class/data path search for external settings explicit by requiring a path: prefix.
-This is a syntax change for this feature introduced in 2.10.0.</li>
-<li>https://issues.apache.org/jira/browse/UIMA-5532 fixed some edge case issues around
-xmi and JSON serialization of Feature values marked as multiple-references-allowed.</li>
+<ul><li>fixed a bug in xmi serialization/deserialization of 0-length string array</li>
+<li>added a filter to the Annotation Viewer utility</li>
+<li>Eclipse plugin jars are now Eclipse-signed.</li>
+<li>The Eclipse examples project fixed a typo in the javadoc attachments.
+<li>The Eclipse update site was pruned of old releases; these are still available at
+https://archive.apache.org/dist/uima/eclipse-update-site/uimaj-2.3.1-2.10.1
 </ul>
  
 <h2><a id="list.issues">Full list of JIRA Issues Fixed in this Release</a></h2>

--- a/aggregate-uimaj-docbooks/pom.xml
+++ b/aggregate-uimaj-docbooks/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.uima</groupId>
    <artifactId>uimaj-parent</artifactId>
-    <version>2.10.1</version>
+    <version>2.10.2</version>
    <relativePath>../uimaj-parent/pom.xml</relativePath>
  </parent>

@@ -42,13 +42,13 @@
       element, and just changing the following two properties -->  
  <scm>
    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj-docbooks
+      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj-docbooks
    </connection>
    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj-docbooks
+      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj-docbooks
    </developerConnection>
    <url>
-      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj-docbooks
+      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj-docbooks
    </url>
  </scm>
  

--- a/aggregate-uimaj-eclipse-plugins/pom.xml
+++ b/aggregate-uimaj-eclipse-plugins/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.uima</groupId>
    <artifactId>uimaj-parent</artifactId>
-    <version>2.10.1</version>
+    <version>2.10.2</version>
    <relativePath>../uimaj-parent/pom.xml</relativePath>
  </parent>

@@ -44,13 +44,13 @@
       element, and just changing the following two properties -->
  <scm>
    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj-eclipse-plugins
+      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj-eclipse-plugins
    </connection>
    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj-eclipse-plugins
+      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj-eclipse-plugins
    </developerConnection>
    <url>
-      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj-eclipse-plugins
+      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj-eclipse-plugins
    </url>
  </scm>


--- a/aggregate-uimaj/pom.xml
+++ b/aggregate-uimaj/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.uima</groupId>
    <artifactId>uimaj-parent</artifactId>
-    <version>2.10.1</version>
+    <version>2.10.2</version>
    <relativePath>../uimaj-parent/pom.xml</relativePath>
  </parent>

@@ -43,13 +43,13 @@
       element, and just changing the following two properties -->  
  <scm>
    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj
+      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj
    </connection>
    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj
+      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj
    </developerConnection>
    <url>
-      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.1/aggregate-uimaj
+      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.2/aggregate-uimaj
    </url>
  </scm>
  

--- a/debian/changelog
+++ b/debian/changelog
+uimaj (2.10.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Fixes CVE-2017-15691: XML external entity expansion (XXE) attack exposure
+      (Closes: #897009)
+  * Fixed the build failure with Java 11 (Closes: #912268)
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+  * Removed the debian/orig-tar.sh script
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 30 Oct 2018 10:43:18 +0100
+
 uimaj (2.10.1-2) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -28,9 +28,9 @@ Build-Depends-Indep: default-jdk-doc,
                     libxerces2-java,
                     libxml-commons-resolver1.1-java,
                     xsltproc
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/uimaj.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/uimaj.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/uimaj.git
+Vcs-Browser: https://salsa.debian.org/java-team/uimaj
 Homepage: http://uima.apache.org

 Package: libuima-core-java

--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache UIMA Java SDK
 Upstream-Contact: The Apache Software Foundation <http://incubator.apache.org/uima/>
 Source: http://www.apache.org/dist/incubator/uima/source/
+Files-Excluded: uima-docbook-tool/tools/common-lib/*.jar
+                uimaj-eclipse-update-site/features/*.jar

 Files: *
 Copyright: Copyright 2006, 2010 The Apache Software Foundation

--- a/debian/maven.properties
+++ b/debian/maven.properties
 maven.test.skip=true
+maven.compiler.release=8
--- a/debian/orig-tar.exclude
+++ b/debian/orig-tar.exclude
-uima-docbook-tool/tools/common-lib/*.jar
-uimaj-eclipse-update-site/features/*.jar
-
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
-#!/bin/sh -e
-
-# $2 version
-# $3 original tarball
-ZIP=$3
-TAR=../uimaj_$2.orig.tar.xz
-DIR=uimaj-$2
-
-# clean up the upstream tarball
-unzip $ZIP
-XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
-rm $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi
-
-exit 0
-
--- a/debian/patches/disable_internal_javadoc.diff
+++ b/debian/patches/disable_internal_javadoc.diff
 --- a/pom.xml
 +++ b/pom.xml
-@@ -185,8 +185,8 @@
+@@ -194,8 +194,8 @@
         <executions>
           <execution>
             <id>javadocs-distr</id> <!-- name should match one in parent-pom --> 

--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,3 @@ override_dh_install:

 	# Set correct perms (on runUimaClass.sh and setUimaClassPath.sh)
 	chmod +x debian/uima-utils/usr/share/uima/bin/*.sh
-
-get-orig-source:
-	uscan --force-download --rename
--- a/debian/watch
+++ b/debian/watch
-version=3
-http://archive.apache.org/dist/uima/uimaj-([\d\.]+)/uimaj-([\d\.]+)-source-release.zip debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz" \
+http://archive.apache.org/dist/uima/uimaj-([\d\.]+)/uimaj-([\d\.]+)-source-release.zip
--- a/issuesFixed/jira-report.html
+++ b/issuesFixed/jira-report.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.4 at 2017-08-22 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.4 at 2017-10-30 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
      @import url("./css/site.css");
    </style>
    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20170822" />
+    <meta name="Date-Revision-yyyymmdd" content="20171030" />
    <meta http-equiv="Content-Language" content="en" />
        
        </head>
@@ -24,7 +24,7 @@
            
                    
                <div class="xleft">
-        <span id="publishDate">Last Published: 2017-08-22</span>
+        <span id="publishDate">Last Published: 2017-10-30</span>
                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
                      </div>
            <div class="xright">        
@@ -57,49 +57,24 @@
 <th>Summary</th></tr>
 <tr class="b">
 <td>Bug</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-4793">UIMA-4793</a></td>
+<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5544">UIMA-5544</a></td>
 <td>Resolved</td>
-<td>Unable to localize exceptions when using alternative classloader</td></tr>
+<td>XmiCasDeserializer test doing invalid cas building - causes error in uv3</td></tr>
 <tr class="a">
 <td>Bug</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5394">UIMA-5394</a></td>
-<td>Closed</td>
-<td>permissions wrong on api-change-report in binary build</td></tr>
-<tr class="b">
-<td>Bug</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5435">UIMA-5435</a></td>
-<td>Closed</td>
-<td>UIMA Class Loader getResource doesn't look first in its own resources</td></tr>
-<tr class="a">
-<td>Bug</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5460">UIMA-5460</a></td>
-<td>Closed</td>
-<td>NPE in PearAnalysisEngineWrapper.createRM</td></tr>
+<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5558">UIMA-5558</a></td>
+<td>Resolved</td>
+<td>xmi serialization/deserialization of 0-length array being deserialized as null</td></tr>
 <tr class="b">
 <td>Bug</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5532">UIMA-5532</a></td>
-<td>Closed</td>
-<td>xmi/json serialization multiple-refs-allowed sometimes fails to serialize item</td></tr>
-<tr class="a">
-<td>Improvement</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5411">UIMA-5411</a></td>
-<td>Closed</td>
-<td>Make the class/data path search for external settings explicit by requiring a path: prefix</td></tr>
-<tr class="b">
-<td>Improvement</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5524">UIMA-5524</a></td>
-<td>Closed</td>
-<td>add test case for all varieties of rattling iterators</td></tr>
+<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5628">UIMA-5628</a></td>
+<td>Resolved</td>
+<td>wrong path for javadocs in examples project</td></tr>
 <tr class="a">
 <td>Improvement</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5533">UIMA-5533</a></td>
-<td>Closed</td>
-<td>improve sorted index insert and faster findEq when lots of equal items</td></tr>
-<tr class="b">
-<td>Test</td>
-<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5538">UIMA-5538</a></td>
-<td>Closed</td>
-<td>add -D flag to enable Feature Structure tracing</td></tr></table></div>
+<td><a class="externalLink" href="https://issues.apache.org/jira/browse/UIMA-5563">UIMA-5563</a></td>
+<td>Resolved</td>
+<td>Improve Annotation Viewer File Section UI</td></tr></table></div>
      </div>
    </div>
    <div class="clear">

--- a/jVinci/pom.xml
+++ b/jVinci/pom.xml
@@ -23,7 +23,7 @@
  <parent>
    <groupId>org.apache.uima</groupId>
    <artifactId>uimaj-parent</artifactId>
-    <version>2.10.1</version> 
+    <version>2.10.2</version> 
    <relativePath>../uimaj-parent/pom.xml</relativePath>
  </parent>

@@ -46,13 +46,13 @@
       element, and just changing the following two properties -->  
  <scm>
    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/jVinci
+      scm:svn:http://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/jVinci
    </connection>
    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.1/jVinci
+      scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/tags/uimaj-2.10.2/jVinci
    </developerConnection>
    <url>
-      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.1/jVinci
+      http://svn.apache.org/viewvc/uima/uimaj/tags/uimaj-2.10.2/jVinci
    </url>
  </scm>
  

--- a/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java
+++ b/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java
@@ -29,6 +29,8 @@ import javax.xml.parsers.SAXParserFactory;

 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;

@@ -48,6 +50,15 @@ import org.apache.vinci.transport.util.TransportableConverter;
 */
 public class XMLToVinci {

+  private static final SAXParserFactory spf = SAXParserFactory.newInstance();
+  static {
+    try {
+      spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+    } catch (SAXNotRecognizedException | SAXNotSupportedException
+        | ParserConfigurationException e) {
+      System.err.println("Warning: SAXParserFactory didn't recognized the feature http://apache.org/xml/features/disallow-doctype-decl");
+    }
+  }
  /**
   * Utility class not intended to be instantiated.
   */
@@ -243,15 +254,23 @@ public class XMLToVinci {
  public static VinciFrame xmlToVinciFrame(Reader r) throws ServiceException {
    XMLReader xr;
    try {
-      xr = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+      synchronized(spf) {
+        xr = spf.newSAXParser().getXMLReader();
+      }
    } catch (SAXException e) {
      throw new ServiceException("Error creating SAX Parser: " + e);
    } catch (ParserConfigurationException e) {
      throw new ServiceException("Error creating SAX Parser: " + e);
    }
    // prevent undeclared namespace warnings.
+    try {
      try {
        xr.setFeature("http://xml.org/sax/features/namespaces", false);
+      } catch (SAXNotRecognizedException e) {
+        System.err.println("Warning: XMLReader didn't recognize the feature http://xml.org/sax/features/namespaces");
+      } catch (SAXNotSupportedException e) {
+        System.err.println("Warning: XMLReader doesn't support the feature http://xml.org/sax/features/namespaces");
+      }
      VinciFrameHandler handler = new VinciFrameHandler();
      xr.setContentHandler(handler);
      xr.setErrorHandler(handler);
@@ -284,7 +303,9 @@ public class XMLToVinci {
  public static AFrame xmlToAFrame(Reader r) throws ServiceException {
    XMLReader xr;
    try {
-      xr = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+      synchronized (spf) {
+        xr = spf.newSAXParser().getXMLReader();
+      }
    } catch (SAXException e) {
      throw new ServiceException("Error creating SAX Parser: " + e);
    } catch (ParserConfigurationException e) {

--- a/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
+++ b/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToXTalk.java
@@ -37,16 +37,17 @@ import java.util.ArrayList;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;

-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
 import org.apache.vinci.debug.Debug;
 import org.apache.vinci.debug.FatalException;
 import org.apache.vinci.transport.ServiceException;
 import org.apache.vinci.transport.XTalkTransporter;
 import org.apache.vinci.transport.util.XMLConverter;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;

 /**
 * Class for parsing an XML document and converting directly to XTalk.
@@ -215,7 +216,15 @@ public class XMLToXTalk {
      XTalkTransporter.writeInt(1, os);
      XMLReader xr;
      try {
-        xr = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        try {
+          spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        } catch (SAXNotRecognizedException e) {
+          System.err.println("Warning: SAXParserFactory didn't recognized feature http://apache.org/xml/features/disallow-doctype-decl");
+        } catch (SAXNotSupportedException e) {
+          System.err.println("Warning: SAXParserFactory doesn't support feature http://apache.org/xml/features/disallow-doctype-decl");
+        }
+        xr = spf.newSAXParser().getXMLReader();
      } catch (SAXException e) {
        throw new ServiceException("Error creating SAX Parser: " + e);
      } catch (ParserConfigurationException e) {

--- a/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
+++ b/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
@@ -29,6 +29,7 @@ import java.util.Hashtable;

 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;

 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -407,7 +408,15 @@ public class ServiceRegistry {
  /* Methods to load and save registry info */
  public void load(String fname) throws Exception {

-    DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+    try {
+      dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+    } catch (ParserConfigurationException e) {
+      System.err.println("Warning: DocumentBuilderFactory doesn't support the feature http://apache.org/xml/features/disallow-doctype-decl");
+    }
+  
+    DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+

    FileReader readme = new FileReader(fname);
    Document doc;