bump tika.jar to 2.5

Author: gggeek

CHANGELOG.md

@@ -1,5 +1,7 @@
-Changelog eztika 1.15 to xxx (unreleased)
-----------------------------------------
+Changelog eztika 1.15 to 2.0
+----------------------------
+
+- upgraded bundled tika.jar to 2.5.0
 
 - added testing of the extension via GitHub Actions
 

bin/eztika

@@ -4,4 +4,4 @@ JAVA=${JAVA:-/usr/bin/java}
 TIKA_JAR=${TIKA_JAR:-./extension/eztika/bin/tika.jar}
 TIKA_LOG4J=${TIKA_LOG4J:-./extension/eztika/bin/log4j.properties}
 
-"$JAVA" -Dlog4j.configuration="file:$TIKA_LOG4J" -jar "$TIKA_JAR" --text --encoding=utf8 "$1" 2>>./var/log/eztika.log
+"$JAVA" -Dlog4j.configurationFile="$TIKA_LOG4J" -jar "$TIKA_JAR" --text --encoding=utf8 "$1" 2>>./var/log/eztika.log

bin/log4j.properties

@@ -1,12 +1,13 @@
 # almost the same as the default log4j config file from eztika, but adds timestamps to log lines
 
-# info,debug, error,fatal ...
-log4j.rootLogger=info,stderr
+# info,debug,error,fatal ...
+rootLogger.level = info
+rootLogger.appenderRefs = console
+rootLogger.appenderRef.console.ref = STDERR
 
-# console
-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
-log4j.appender.stderr.Target=System.err
-
-# was: log4j.appender.stderr.layout.ConversionPattern= %-5p %m%n
-log4j.appender.stderr.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n
+# console (stderr)
+appender.stderr.type = Console
+appender.stderr.name = STDERR
+appender.stderr.target = SYSTEM_ERR
+appender.stderr.layout.type = PatternLayout
+appender.stderr.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %m%n

bin/tika.jar

@@ -2,7 +2,7 @@
 <software>
     <metadata>
         <name>eZ Tika</name>
-        <version>1.15.0</version>
+        <version>2.0.0</version>
         <copyright>Copyright © 2008-2022 Paul Borgermans</copyright>
         <license>GNU General Public License v2.0</license>
         <info_url>https://github.com/xrowgmbh/eztika</info_url>
@@ -12,7 +12,7 @@
                 <name>Tika</name>
                 <license>Apache License, Version 2.0</license>
                 <info_url>https://tika.apache.org/</info_url>
-                <version>1.28.5</version>
+                <version>2.5.0</version>
             </uses>
         </software>
     </metadata>

extension.xml

@@ -33,13 +33,13 @@ static function info()
     {
         return array(
             'Name' => "eZ Tika",
-            'Version' => "1.15.0",
+            'Version' => "2.0.0",
             'Copyright' => "Copyright 2008-2022 Paul Borgermans",
             'Info_url' => "https://github.com/xrowgmbh/eztika",
             'License' => "GNU General Public License v2.0",
             '3rdparty_software' =>
                         array ( 'name' => 'Tika',
-                                'Version' => '1.28.5',
+                                'Version' => '2.5.0',
                                 'copyright' => 'The Apache Software Foundation.',
                                 'license' => 'Apache License, Version 2.0',
                                 'info_url' => 'https://tika.apache.org/' ) );