[tika] branch main updated: TIKA-3751: update spring, improve comment

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new f92dc3f9b TIKA-3751: update spring, improve comment
     new e2a6d2513 Merge origin/main into main
f92dc3f9b is described below

commit f92dc3f9be53a27cb52449500a83bd63c799648c
Author: THausherr <ti...@snafu.de>
AuthorDate: Wed May 11 19:09:21 2022 +0200

    TIKA-3751: update spring, improve comment
---
 tika-parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 38833522d..26aa26625 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -371,7 +371,7 @@
     <!-- we'll need to stay on 1.7 until we're java modularized ? -->
     <slf4j.version>1.7.36</slf4j.version>
     <solrj.version>8.11.1</solrj.version>
-    <spring.version>5.3.19</spring.version>
+    <spring.version>5.3.20</spring.version>
     <sqlite.version>3.36.0.3</sqlite.version>
     <tagsoup.version>1.2.1</tagsoup.version>
     <test.containers.version>1.17.1</test.containers.version>
@@ -615,7 +615,7 @@
         <artifactId>jdom2</artifactId>
         <version>${jdom2.version}</version>
       </dependency>
-      <!-- dependency convergence problems with jakarata.activation if > 2.0.1 -->
+      <!-- dependency convergence problems with jakarta.activation if > 2.0.1 on jdk11 -->
       <dependency>
         <groupId>org.jvnet.staxex</groupId>
         <artifactId>stax-ex</artifactId>