Merge branch 'release/2.5.0' into release/3.1.0

* release/2.5.0:
  [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+