tree e02abb5e75d7427fa39b68a59ec64901fe972d1b
parent bee0cbf78d7f6c503f4142608616e285291df329
parent a6bd86fe7162bd505d890f52c7f7470b52843571
author Richard Eckart de Castilho <rec@apache.org> 1587932823 +0200
committer Richard Eckart de Castilho <rec@apache.org> 1587932823 +0200

Merge branch 'master-v2' into sync-master-v2-to-master

* master-v2:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release uimafit-2.5.0
  [NO JIRA] Fixed another HTML tag in the JavaDoc on which Java 14 may choke (depending on vendor)
  [UIMA-6224] uimaFIT does not build on Java 14
  [UIMA-6223] Groovy plugin causes warning during build
  [UIMA-6223] Groovy plugin causes warning during build
  [UIMA-6222] XML-related unit test fails on Java 9+
  [NO JIRA] Reduce console output during build by commenting out println statements in test code and trying to suppress stack traces of expected exceptions
  [UIMA-6223] Groovy plugin causes warning during build
  [UIMA-6223] Groovy plugin causes warning during build
  [NO JIRA] Update Eclipse metadata files
  [UIMA-6222] XML-related unit test fails on Java 9+
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release uimafit-2.5.0
  [NO JIRA] Move the japicmp section from plugins management to plugins otherwise it seems the proper location of the post-analysis script is not picked up
  [NO JIRA] Updated README file for release.
  [NO JIRA] Updated README file for release.
  [NO JIRA] Updated README file for release.
  [UIMA-6181]b Fix complaints about maven-plugin-plugin in Eclipse

% Conflicts:
%	README
%	pom.xml
%	uimafit-benchmark/pom.xml
%	uimafit-core/pom.xml
%	uimafit-cpe/pom.xml
%	uimafit-docbook/pom.xml
%	uimafit-examples/pom.xml
%	uimafit-legacy-support/pom.xml
%	uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/AnnotationLiteral.java
%	uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java
%	uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
%	uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java
%	uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java
%	uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/CasUtilTest.java
%	uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
%	uimafit-maven-plugin/pom.xml
%	uimafit-parent/pom.xml
%	uimafit-spring/pom.xml