[uimaj] 01/03: Merge tag 'upstream/2.4.2'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository uimaj.

commit 7bf6cbb9f781b668b60506934024ce6927926f82
Merge: 27d333d cdf816f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 20 23:14:27 2014 +0100

    Merge tag 'upstream/2.4.2'
    
    Upstream version 2.4.2

 DEPENDENCIES                                       |  34 ++--
 PearPackagingMavenPlugin/pom.xml                   |  10 +-
 README                                             |  43 +----
 RELEASE_NOTES.html                                 |  14 +-
 aggregate-uimaj-docbooks/pom.xml                   |  10 +-
 aggregate-uimaj-eclipse-plugins/pom.xml            |  10 +-
 aggregate-uimaj/pom.xml                            |  10 +-
 issuesFixed/jira-report.html                       |   8 +-
 jVinci/pom.xml                                     |  10 +-
 jcasgen-maven-plugin/pom.xml                       |   4 +-
 pom.xml                                            |  13 +-
 uima-docbook-overview-and-setup/pom.xml            |  10 +-
 uima-docbook-references/pom.xml                    |  10 +-
 uima-docbook-tools/pom.xml                         |  10 +-
 .../src/docbook/tools.eclipse_launcher.xml         |   2 +-
 uima-docbook-tutorials-and-users-guides/pom.xml    |  10 +-
 .../src/docbook/tug.application.xml                | 186 +++++++++++----------
 uimaj-adapter-soap/pom.xml                         |  10 +-
 uimaj-adapter-vinci/pom.xml                        |  10 +-
 uimaj-bootstrap/pom.xml                            |  10 +-
 uimaj-component-test-util/pom.xml                  |  10 +-
 uimaj-core/pom.xml                                 |  10 +-
 .../java/org/apache/uima/cas/impl/CASImpl.java     |   5 +
 .../org/apache/uima/cas/impl/Serialization.java    |   6 +-
 .../apache/uima/resource/Resource_ImplBase.java    |   7 +
 .../impl/ConfigurationManagerImplBase.java         |   2 +-
 .../resource/impl/ConfigurationManager_impl.java   |  42 +++--
 .../metadata/impl/ResourceMetaData_impl.java       |  34 +++-
 .../main/java/org/apache/uima/util/CasCopier.java  |  79 ++++++---
 .../impl/AnalysisEngine_implTest.java              |  23 ++-
 .../uima/util/impl/JSR47Logger_implTest.java       |   3 +
 .../AnnotatorWithGroupParameterError.xml           | 156 +++++++++++++++++
 uimaj-cpe/checkpoint.dat.prev                      | Bin 1368 -> 704 bytes
 uimaj-cpe/pom.xml                                  |  10 +-
 uimaj-document-annotation/pom.xml                  |  10 +-
 uimaj-eclipse-feature-runtime/feature.xml          |   4 +-
 uimaj-eclipse-feature-runtime/pom.xml              |  10 +-
 uimaj-eclipse-feature-tools/feature.xml            |  18 +-
 uimaj-eclipse-feature-tools/pom.xml                |  10 +-
 uimaj-eclipse-update-site/category.xml             |  34 ----
 uimaj-eclipse-update-site/pom.xml                  |   2 +-
 uimaj-ep-cas-editor-ide/META-INF/MANIFEST.MF       |  14 +-
 uimaj-ep-cas-editor-ide/pom.xml                    |  10 +-
 uimaj-ep-cas-editor/META-INF/MANIFEST.MF           |  40 ++---
 uimaj-ep-cas-editor/pom.xml                        |  10 +-
 uimaj-ep-configurator/META-INF/MANIFEST.MF         |  24 +--
 uimaj-ep-configurator/pom.xml                      |  10 +-
 uimaj-ep-debug/META-INF/MANIFEST.MF                |  10 +-
 uimaj-ep-debug/pom.xml                             |  10 +-
 uimaj-ep-jcasgen/META-INF/MANIFEST.MF              |  10 +-
 uimaj-ep-jcasgen/pom.xml                           |  10 +-
 uimaj-ep-launcher/META-INF/MANIFEST.MF             |  10 +-
 uimaj-ep-launcher/pom.xml                          |  10 +-
 .../AnalysisEngineLaunchConfigurationDelegate.java |  79 +++++----
 .../apache/uima/ep_launcher/RemoteLauncher.java    |  12 ++
 .../ep_launcher/ui/AnalysisEngineTabGroup.java     |   7 +-
 uimaj-ep-pear-packager/META-INF/MANIFEST.MF        |  16 +-
 uimaj-ep-pear-packager/pom.xml                     |  10 +-
 uimaj-ep-runtime/META-INF/MANIFEST.MF              | 140 ++++++++--------
 uimaj-ep-runtime/pom.xml                           |  10 +-
 uimaj-examples/pom.xml                             |  10 +-
 .../examples/cpe/FileSystemCollectionReader.java   |   2 +-
 uimaj-parent/pom.xml                               |  60 ++++++-
 uimaj-test-util/pom.xml                            |  10 +-
 uimaj-tools/pom.xml                                |  16 +-
 65 files changed, 852 insertions(+), 587 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uimaj.git