You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tika.apache.org by ta...@apache.org on 2021/07/28 15:03:18 UTC

[tika] 03/03: Merge remote-tracking branch 'origin/main' into main

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

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

commit 35ecfdca91b5df9c46d23177156c2a634bd72a8e
Merge: bb0fbe6 9a6dbed
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 11:03:05 2021 -0400

    Merge remote-tracking branch 'origin/main' into main

 tika-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc tika-parent/pom.xml
index a0aa307,0b912cf..e28501c
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@@ -355,9 -350,9 +355,9 @@@
      <rome.version>1.16.0</rome.version>
      <sis.version>1.0</sis.version>
      <!-- we'll need to stay on 1.7 until we're java modularized ? -->
 -    <slf4j.version>1.7.31</slf4j.version>
 +    <slf4j.version>1.7.32</slf4j.version>
      <solrj.version>8.9.0</solrj.version>
-     <spring.version>5.3.8</spring.version>
+     <spring.version>5.3.9</spring.version>
      <sqlite.version>3.36.0.1</sqlite.version>
      <tagsoup.version>1.2.1</tagsoup.version>
      <test.containers.version>1.15.2</test.containers.version>