Sync master v2 to master #105
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add m2e config for maven-plugin-plugin to uimaFIT parent POM so we do not have to wait for a release of the UIMA-wide parent-pom-14 before the next uimaFIT v3 release (cherry picked from commit a751791)
… otherwise it seems the proper location of the post-analysis script is not picked up
- Ignore whitespace during XML comparison to run on recent JDKs
- Upgrade Groovy version using during build to a Groovy v3 which does no longer trigger the warning
- Added a log message indicating what the Groovy script does
…n statements in test code and trying to suppress stack traces of expected exceptions
…in-causes-warning-during-build [UIMA-6223] Groovy plugin causes warning during build
…-test-fails-on-Java-9 [UIMA-6222] XML-related unit test fails on Java 9+
- Ignore whitespace during XML comparison to run on recent JDKs (cherry picked from commit b464133)
- Upgrade Groovy version using during build to a Groovy v3 which does no longer trigger the warning (cherry picked from commit 6613cee)
- Added a log message indicating what the Groovy script does (cherry picked from commit 7ff0da7)
- Upgrade to Maven Enforcer plugin 3.0.0-M3 for recent Java JDK compatibility - Upgrade to japicmp Maven plugin 0.14.3 for recent Java JDK compatibility - Fixed out-of-sequence headers in JavaDoc - Replace name with id attribute in anchors in JavaDoc
…-build-on-Java-14 [UIMA-6224] uimaFIT does not build on Java 14
* master-v2: [UIMA-6224] uimaFIT does not build on Java 14 [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+ % Conflicts: % uimafit-parent/pom.xml
…choke (depending on vendor)
Release/2.5.0
* 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging updates form the v2 branch. These changes are actually mostly already included in the 3.1.0 release branch.