Issue #390: Merge uimaFIT modules into UIMA-J repository #391
Conversation
This file contains 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
- Align more tests
- Added various unit tests
…following-with-predicate-in-UIMA-core [UIMA-6314] Align preceding/following with predicate in UIMA core
* main: [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6314] Align preceding/following with predicate in UIMA core
…ameter-support [UIMA-6312] Better PEAR parameter support
…tput-folder-as-resource-folder * main: [UIMA-6312] Better PEAR parameter support [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6312] Better PEAR parameter support
…esources-output-folder-as-resource-folder [UIMA-6311] Add generated resources output folder as resource folder
…SHOT [No Jira] Set version to 3.2.0-SNAPSHOT
- Remove compatibility checking stuff which is now included in the parent POM
…to-Parent-POM-14 [UIMA-6326] Update uimaFIT to Parent POM 14
…OM-14 * main: (156 commits) [No Jira] Set version to 3.2.0-SNAPSHOT [UIMA-6312] Better PEAR parameter support [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6312] Better PEAR parameter support [UIMA-6311] Add generated resources output folder as resource folder [UIMA-6301] Rename "master" branches to "main" [UIMA-6254] Move API report post-analysis script into the build resources [UIMA-6254] Move API report post-analysis script into the build resources [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6291] Improve uimaFIT benchmarking module - Changed new timer names to include the postfix time, so that it is more clear that it is a time value. [UIMA-6291] Improve uimaFIT benchmarking module - Added select and selectAt benchmarks using getAnnotationIndex approach. [UIMA-6291] Improve uimaFIT benchmarking module - Added more selectCovered benchmarks with s.getBegin() and s.getEnd(). [UIMA-6291] Improve uimaFIT benchmarking module - Added support for nanoseconds CPU time support in Benchmark and changed SelectBenchmark to use user time. [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6270] Add selectOverlapping to (J)CasUtil [UIMA-6270] Add selectOverlapping to (J)CasUtil [UIMA-6292] selectCovering is slow [UIMA-6270] Add selectOverlapping to (J)CasUtil ... % Conflicts: % uimafit-parent/pom.xml
…to-Parent-POM-14 [UIMA-6326] Update UIMA fit to parent pom 14
- Update version - Update NOTICE / LICENSE files used by binary distribution
…ependency [UIMA-6333] Update Spring dependency
* main: (156 commits) [No Jira] Set version to 3.2.0-SNAPSHOT [UIMA-6312] Better PEAR parameter support [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6312] Better PEAR parameter support [UIMA-6311] Add generated resources output folder as resource folder [UIMA-6301] Rename "master" branches to "main" [UIMA-6254] Move API report post-analysis script into the build resources [UIMA-6254] Move API report post-analysis script into the build resources [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6291] Improve uimaFIT benchmarking module - Changed new timer names to include the postfix time, so that it is more clear that it is a time value. [UIMA-6291] Improve uimaFIT benchmarking module - Added select and selectAt benchmarks using getAnnotationIndex approach. [UIMA-6291] Improve uimaFIT benchmarking module - Added more selectCovered benchmarks with s.getBegin() and s.getEnd(). [UIMA-6291] Improve uimaFIT benchmarking module - Added support for nanoseconds CPU time support in Benchmark and changed SelectBenchmark to use user time. [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6270] Add selectOverlapping to (J)CasUtil [UIMA-6270] Add selectOverlapping to (J)CasUtil [UIMA-6292] selectCovering is slow [UIMA-6270] Add selectOverlapping to (J)CasUtil ... % Conflicts: % uimafit-parent/pom.xml
- Backport tests from v3 - Adjust behavior of several select* calls to align with the v3 behavior
…ependency [UIMA-6333] update spring dependency
…haviors-of-uimaFITv2-with-uimaFITv3 [UIMA-6336] Align select behaviors of uimaFITv2 with uimaFITv3
- Upgrade to UIMA Parent POM 14 release version - Remove outdated commented-out dependency on Spring AOP - Upgrade Maven Compile Plugin to same version we have in the parent - Remove m2e configurations already included in the parent POM
- Commented out snapshot repos
- Upgrade japicmp / groovy plugin/plugin dependencies for compatibility with Java 16 - Upgrade groovy-all plugin dependency for compatibility with Java 16 - Upgrade to parent POM 14 (release)
…cessing-script-fails-with-Java-16 UIMA-6351: japicmp post processing script fails with Java 16 (uimaFIT)
…ipt-fails-with-Java-16 * main: (156 commits) [No Jira] Set version to 3.2.0-SNAPSHOT [UIMA-6312] Better PEAR parameter support [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6314] Align preceding/following with predicate in UIMA core [UIMA-6312] Better PEAR parameter support [UIMA-6311] Add generated resources output folder as resource folder [UIMA-6301] Rename "master" branches to "main" [UIMA-6254] Move API report post-analysis script into the build resources [UIMA-6254] Move API report post-analysis script into the build resources [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6291] Improve uimaFIT benchmarking module - Changed new timer names to include the postfix time, so that it is more clear that it is a time value. [UIMA-6291] Improve uimaFIT benchmarking module - Added select and selectAt benchmarks using getAnnotationIndex approach. [UIMA-6291] Improve uimaFIT benchmarking module - Added more selectCovered benchmarks with s.getBegin() and s.getEnd(). [UIMA-6291] Improve uimaFIT benchmarking module - Added support for nanoseconds CPU time support in Benchmark and changed SelectBenchmark to use user time. [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6291] Improve uimaFIT benchmarking module [UIMA-6270] Add selectOverlapping to (J)CasUtil [UIMA-6270] Add selectOverlapping to (J)CasUtil [UIMA-6292] selectCovering is slow [UIMA-6270] Add selectOverlapping to (J)CasUtil ... % Conflicts: % uimafit-core/src/main/java/org/apache/uima/fit/util/CasUtil.java % uimafit-core/src/test/java/org/apache/uima/fit/util/CasUtilTest.java % uimafit-core/src/test/java/org/apache/uima/fit/util/SelectionAssert.java
…cessing-script-fails-with-Java-16 UIMA-6351: japicmp post processing script fails with java 16
* main: UIMA-6351: japicmp post processing script fails with Java 16 (uimaFIT) [UIMA-6336] Align select behaviors of uimaFITv2 with uimaFITv3
- Switch to UIMA 3.2.0 release version
- Update README file - Configure Jira report for release version
* Upgrade to Commons IO 2.8.0 * Upgrade to Commons Lang 3 to 3.12.0
…Commons-dependencies [UIMA-6357] Upgrade Apache Commons dependencies
- Fix version of BOM
Issue #235: Update dependencies
Issue #239: Apache UIMA uimaFIT 3.5.0
No issue: Set version to 3.6.0-SNAPSHOT
… into refactoring/390-Merge-uimaFIT-modules-into-UIMAJ-repository % Conflicts: % .gitignore
- Add uimaFIT modules to build - Merge uimaFIT BOM into UIMAJ BOM
- Consolidate dependencies and test logging
- Activate depedency checking on most modules
- Remove unused uimafit parent
- Consolidate dependencies
reckart
changed the title
reckart
changed the title
- Cleaning up old files from the uimaFIT repo root
- Deprecate uimaj-component-test-util
- Integrate uimafit documentation module into uimaj documentation module
- Switch back to explicitly using slf4j-simple where needed because in uimaj-core, we need to not have it on the classpath - Fix dependencies for JavaDoc
- UIMA Parent POM 17 -> 18-SNAPSHOT - Update migration guide a bit - Added option to skip the docs during the build - Update the JavaDoc plugin configuration - Set goal prefix for the pear maven plugin
reckart
force-pushed
the
refactoring/390-Merge-uimaFIT-modules-into-UIMAJ-repository
branch
from
f6affd1 to
0b9d4c2
Compare
- Minor cleanup
reckart
deleted the
refactoring/390-Merge-uimaFIT-modules-into-UIMAJ-repository
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What's in the PR
How to test manually
Automatic testing
Documentation
Organizational
Only dependencies under approved licenses are allowed. LICENSE and NOTICE files in the respective modules where dependencies have been added as well as in the project root have been updated.