Merge branch 'main' into feature/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
diff --git a/src/main/dist-bin/LICENSE b/src/main/dist-bin/LICENSE
index df56428..97f7bf0 100644
--- a/src/main/dist-bin/LICENSE
+++ b/src/main/dist-bin/LICENSE
@@ -203,9 +203,9 @@
=======================================================================
-SPRING FRAMEWORK 4.3.26.RELEASE SUBCOMPONENTS:
+SPRING FRAMEWORK 4.3.30.RELEASE SUBCOMPONENTS:
-Spring Framework 4.3.26.RELEASE includes a number of subcomponents
+Spring Framework 4.3.30.RELEASE includes a number of subcomponents
with separate copyright notices and license terms. The product that
includes this file does not necessarily use all the open source
subcomponents referred to below. Your use of the source
@@ -262,6 +262,13 @@
http://objenesis.org/download.html, Objenesis 2.6 is licensed under the
Apache License, version 2.0, the text of which is included above.
+Per the NOTICE file in the Objenesis ZIP distribution downloaded from
+http://objenesis.org/download.html and corresponding to section 4d of the
+Apache License, Version 2.0, in this case for Objenesis:
+
+Objenesis
+Copyright 2006-2017 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+
===============================================================================
diff --git a/src/main/dist-bin/NOTICE b/src/main/dist-bin/NOTICE
index a8becec..f2ce7ae 100644
--- a/src/main/dist-bin/NOTICE
+++ b/src/main/dist-bin/NOTICE
@@ -56,7 +56,7 @@
----------------------------------------------------------------
-Spring Framework 4.3.26.RELEASE
+Spring Framework 4.3.30.RELEASE
Copyright (c) 2002-2020 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml
index 11f609c..d13a11a 100644
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@ -32,7 +32,7 @@
<url>${uimaWebsiteUrl}</url>
<inceptionYear>2012</inceptionYear>
<properties>
- <spring.version>4.3.26.RELEASE</spring.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
<uima.version>3.2.0-SNAPSHOT</uima.version>
<slf4j.version>1.7.26</slf4j.version>
<maven.compiler.source>1.8</maven.compiler.source>
