| commit | 600dadcdce63cafc9ec056eb847bcc53d40894fd | [log] [tgz] |
|---|---|---|
| author | Richard Eckart de Castilho <rec@apache.org> | Thu Apr 09 16:56:05 2020 +0200 |
| committer | Richard Eckart de Castilho <rec@apache.org> | Thu Apr 09 16:56:05 2020 +0200 |
| tree | 5ab6cc72b8a50e5d6f565194c003d82a93ee7a94 | |
| parent | bfa3ccb05087e3194dd897f0a67f536bb1540799 [diff] | |
| parent | 1f49570f0cfd47cc0b8b7096b876433c4df8efa2 [diff] |
Merge branch 'master-v2' into sync-master-v2-to-master * master-v2: [UIMA-6147] Upgrade to Spring 4 No issue. Update Eclipse metadata. # Conflicts: # NOTICE # src/main/dist-bin/LICENSE # src/main/dist-bin/NOTICE # uimafit-benchmark/pom.xml # uimafit-cpe/pom.xml # uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs # uimafit-parent/pom.xml