This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 57b920c5e [OPENMEETINGS-2824] tika
57b920c5e is described below
commit 57b920c5e8c91ae23fc4ea86f2eee43851c4f787
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Aug 25 12:50:56 2026 +0700
[OPENMEETINGS-2824] tika
---
LICENSE | 114 ++++++++++-----------
openmeetings-core/src/main/java/module-info.java | 1 +
.../core/converter/ImageConverter.java | 9 +-
openmeetings-util/pom.xml | 5 +
openmeetings-util/src/main/java/module-info.java | 1 +
.../org/apache/openmeetings/util/StoredFile.java | 14 +--
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +-
pom.xml | 57 +++--------
8 files changed, 89 insertions(+), 114 deletions(-)
diff --git a/LICENSE b/LICENSE
index 226c71ba8..9d9600235 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,6 +230,9 @@ conditions of the following licenses.
BSD-2-Clause
+ * commonmark-java core (org.commonmark:commonmark:0.30.0 -
https://github.com/commonmark/commonmark-java/commonmark)
+ * commonmark-java extension for strikethrough
(org.commonmark:commonmark-ext-gfm-strikethrough:0.30.0 -
https://github.com/commonmark/commonmark-java/commonmark-ext-gfm-strikethrough)
+ * commonmark-java extension for tables
(org.commonmark:commonmark-ext-gfm-tables:0.30.0 -
https://github.com/commonmark/commonmark-java/commonmark-ext-gfm-tables)
* PostgreSQL JDBC Driver (org.postgresql:postgresql:42.7.13 -
https://jdbc.postgresql.org)
CC BY 3.0
@@ -238,7 +241,7 @@ conditions of the following licenses.
CDDL, v1.0, LGPL, v2.1 or later
- * JHighlight (org.codelibs:jhighlight:1.1.1 -
https://github.com/codelibs/jhighlight)
+ * JHighlight (org.codelibs:jhighlight:2.0.0 -
https://github.com/codelibs/jhighlight)
CPL
@@ -271,14 +274,10 @@ conditions of the following licenses.
* Jakarta Messaging API (jakarta.jms:jakarta.jms-api:3.1.0 -
https://projects.eclipse.org/projects/ee4j.jms)
* Jakarta Persistence API
(jakarta.persistence:jakarta.persistence-api:3.2.0 -
https://github.com/jakartaee/persistence)
* Jakarta RESTful WS API (jakarta.ws.rs:jakarta.ws.rs-api:4.0.0 -
https://github.com/jakartaee/rest/jakarta.ws.rs-api)
- * JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:6.1.2 -
https://junit.org/)
- * JUnit Platform Commons
(org.junit.platform:junit-platform-commons:6.1.2 - https://junit.org/)
- * Logback Classic Module (ch.qos.logback:logback-classic:1.6.1 -
http://logback.qos.ch/logback-classic)
- * Logback Core Module (ch.qos.logback:logback-core:1.6.1 -
http://logback.qos.ch/logback-core)
-
- GENERAL PUBLIC LICENSE, version 3 (GPL-3.0), GNU LESSER GENERAL PUBLIC
LICENSE, version 3 (LGPL-3.0), Mozilla Public License Version 1.1
-
- * juniversalchardet (com.github.albfernandez:juniversalchardet:2.5.0 -
https://github.com/albfernandez/juniversalchardet)
+ * JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:6.1.3 -
https://junit.org/)
+ * JUnit Platform Commons
(org.junit.platform:junit-platform-commons:6.1.3 - https://junit.org/)
+ * Logback Classic Module (ch.qos.logback:logback-classic:1.6.3 -
http://logback.qos.ch/logback-classic)
+ * Logback Core Module (ch.qos.logback:logback-core:1.6.3 -
http://logback.qos.ch/logback-core)
iCal4j - License
@@ -310,7 +309,7 @@ conditions of the following licenses.
* Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs
(org.bouncycastle:bcpkix-jdk18on:1.85 -
https://www.bouncycastle.org/download/bouncy-castle-java/)
* Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.85.2 -
https://www.bouncycastle.org/download/bouncy-castle-java/)
* Checker Qual (org.checkerframework:checker-qual:3.55.1 -
https://checkerframework.org/)
- * dd-plist (com.googlecode.plist:dd-plist:1.29 -
http://www.github.com/3breadt/dd-plist)
+ * dd-plist (com.googlecode.plist:dd-plist:1.30 -
http://www.github.com/3breadt/dd-plist)
* dev.samstevens.totp:totp (dev.samstevens.totp:totp:1.7.1 -
https://github.com/samdjstevens/java-totp/totp)
* fullcalendar (org.webjars.npm:fullcalendar:6.1.15 -
https://www.webjars.org)
* inputmask (org.webjars.npm:inputmask:5.0.9 - https://www.webjars.org)
@@ -318,7 +317,7 @@ conditions of the following licenses.
* jQuery++ (org.webjars:jquerypp:1.0.1 - http://webjars.org)
* jquery-ui-touch-punch.js (org.webjars:jquery-ui-touch-punch:0.2.3-2
- http://webjars.org)
* js-cookie (org.webjars.npm:js-cookie:3.0.5 - https://www.webjars.org)
- * jsoup Java HTML Parser (org.jsoup:jsoup:1.22.2 - https://jsoup.org/)
+ * jsoup Java HTML Parser (org.jsoup:jsoup:1.23.1 - https://jsoup.org/)
* just-validate (org.webjars.npm:just-validate:4.3.0 -
https://www.webjars.org)
* lodash.merge (org.webjars.npm:lodash.merge:4.6.2 -
http://webjars.org)
* Microsoft JDBC Driver for SQL Server
(com.microsoft.sqlserver:mssql-jdbc:13.4.0.jre11 -
https://github.com/Microsoft/mssql-jdbc)
@@ -364,7 +363,6 @@ conditions of the following licenses.
* Apache Commons FileUpload Jakarta Servlet 5
(org.apache.commons:commons-fileupload2-jakarta-servlet5:2.0.0-M5 -
https://commons.apache.org/proper/commons-fileupload/commons-fileupload2-jakarta-servlet5/)
* Apache Commons IO (commons-io:commons-io:2.22.0 -
https://commons.apache.org/proper/commons-io/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.20.0 -
https://commons.apache.org/proper/commons-lang/)
- * Apache Commons Logging (commons-logging:commons-logging:1.3.5 -
https://commons.apache.org/proper/commons-logging/)
* Apache Commons Math (org.apache.commons:commons-math3:3.6.1 -
http://commons.apache.org/proper/commons-math/)
* Apache Commons Net (commons-net:commons-net:3.13.0 -
https://commons.apache.org/proper/commons-net/)
* Apache Commons Pool (org.apache.commons:commons-pool2:2.13.1 -
https://commons.apache.org/proper/commons-pool/)
@@ -394,7 +392,6 @@ conditions of the following licenses.
* Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 -
http://hc.apache.org/httpcomponents-core-ga)
* Apache James :: Mime4j :: Core
(org.apache.james:apache-mime4j-core:0.8.14 -
http://james.apache.org/mime4j/apache-mime4j-core)
* Apache James :: Mime4j :: DOM
(org.apache.james:apache-mime4j-dom:0.8.14 -
http://james.apache.org/mime4j/apache-mime4j-dom)
- * Apache JempBox (org.apache.pdfbox:jempbox:1.8.17 -
http://www.apache.org/pdfbox-parent/jempbox/)
* Apache Log4j API (org.apache.logging.log4j:log4j-api:2.24.3 -
https://logging.apache.org/log4j/2.x/log4j/log4j-api/)
* Apache Log4j API (org.apache.logging.log4j:log4j-api:2.25.4 -
https://logging.apache.org/log4j/2.x/)
* Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.25.4 -
https://logging.apache.org/log4j/2.x/)
@@ -407,38 +404,41 @@ conditions of the following licenses.
* Apache POI (org.apache.poi:poi-scratchpad:5.5.1 -
https://poi.apache.org/)
* Apache POI - API based on OPC and OOXML schemas
(org.apache.poi:poi-ooxml:5.5.1 - https://poi.apache.org/)
* Apache POI - Common (org.apache.poi:poi:5.5.1 -
https://poi.apache.org/)
- * Apache POI - OOXML schemas (full)
(org.apache.poi:poi-ooxml-full:5.5.1 - https://poi.apache.org/)
* Apache ServiceMix :: Bundles :: dom4j
(org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:2.1.4_1 -
http://servicemix.apache.org/bundles-pom/org.apache.servicemix.bundles.dom4j/)
* Apache ServiceMix :: Bundles :: xpp3
(org.apache.servicemix.bundles:org.apache.servicemix.bundles.xpp3:1.1.4c_7 -
http://servicemix.apache.org/bundles-pom/org.apache.servicemix.bundles.xpp3/)
- * Apache Tika Apple parser module
(org.apache.tika:tika-parser-apple-module:3.3.2 -
https://tika.apache.org/tika-parser-apple-module/)
- * Apache Tika audiovideo parser module
(org.apache.tika:tika-parser-audiovideo-module:3.3.2 -
https://tika.apache.org/tika-parser-audiovideo-module/)
- * Apache Tika cad parser module
(org.apache.tika:tika-parser-cad-module:3.3.2 -
https://tika.apache.org/tika-parser-cad-module/)
- * Apache Tika code parser module
(org.apache.tika:tika-parser-code-module:3.3.2 -
https://tika.apache.org/tika-parser-code-module/)
- * Apache Tika core (org.apache.tika:tika-core:3.3.2 -
https://tika.apache.org/)
- * Apache Tika crypto parser module
(org.apache.tika:tika-parser-crypto-module:3.3.2 -
https://tika.apache.org/tika-parser-crypto-module/)
- * Apache Tika digest commons
(org.apache.tika:tika-parser-digest-commons:3.3.2 -
https://tika.apache.org/tika-parser-digest-commons/)
- * Apache Tika font parser module
(org.apache.tika:tika-parser-font-module:3.3.2 -
https://tika.apache.org/tika-parser-font-module/)
- * Apache Tika html parser module
(org.apache.tika:tika-parser-html-module:3.3.2 -
https://tika.apache.org/tika-parser-html-module/)
- * Apache Tika image parser module
(org.apache.tika:tika-parser-image-module:3.3.2 -
https://tika.apache.org/tika-parser-image-module/)
- * Apache Tika mail commons
(org.apache.tika:tika-parser-mail-commons:3.3.2 -
https://tika.apache.org/tika-parser-mail-commons/)
- * Apache Tika mail parser module
(org.apache.tika:tika-parser-mail-module:3.3.2 -
https://tika.apache.org/tika-parser-mail-module/)
- * Apache Tika Microsoft parser module
(org.apache.tika:tika-parser-microsoft-module:3.3.2 -
https://tika.apache.org/tika-parser-microsoft-module/)
- * Apache Tika miscellaneous office format parser module
(org.apache.tika:tika-parser-miscoffice-module:3.3.2 -
https://tika.apache.org/tika-parser-miscoffice-module/)
- * Apache Tika news parser module
(org.apache.tika:tika-parser-news-module:3.3.2 -
https://tika.apache.org/tika-parser-news-module/)
- * Apache Tika OCR parser module
(org.apache.tika:tika-parser-ocr-module:3.3.2 -
https://tika.apache.org/tika-parser-ocr-module/)
- * Apache Tika package parser module
(org.apache.tika:tika-parser-pkg-module:3.3.2 -
https://tika.apache.org/tika-parser-pkg-module/)
- * Apache Tika PDF parser module
(org.apache.tika:tika-parser-pdf-module:3.3.2 -
https://tika.apache.org/tika-parser-pdf-module/)
- * Apache Tika plugin for Ogg, Vorbis and FLAC
(org.gagravarr:vorbis-java-tika:0.8 - https://github.com/Gagravarr/VorbisJava)
- * Apache Tika standard parser package
(org.apache.tika:tika-parsers-standard-package:3.3.2 -
https://tika.apache.org/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/)
- * Apache Tika text parser module
(org.apache.tika:tika-parser-text-module:3.3.2 -
https://tika.apache.org/tika-parser-text-module/)
- * Apache Tika WARC parser module
(org.apache.tika:tika-parser-webarchive-module:3.3.2 -
https://tika.apache.org/tika-parser-webarchive-module/)
- * Apache Tika XML parser module
(org.apache.tika:tika-parser-xml-module:3.3.2 -
https://tika.apache.org/tika-parser-xml-module/)
- * Apache Tika XMP commons
(org.apache.tika:tika-parser-xmp-commons:3.3.2 -
https://tika.apache.org/tika-parser-xmp-commons/)
- * Apache Tika ZIP commons
(org.apache.tika:tika-parser-zip-commons:3.3.2 -
https://tika.apache.org/tika-parser-zip-commons/)
+ * Apache Tika Apple parser module
(org.apache.tika:tika-parser-apple-module:4.0.0 -
https://tika.apache.org/tika-parser-apple-module/)
+ * Apache Tika audiovideo parser module
(org.apache.tika:tika-parser-audiovideo-module:4.0.0 -
https://tika.apache.org/tika-parser-audiovideo-module/)
+ * Apache Tika cad parser module
(org.apache.tika:tika-parser-cad-module:4.0.0 -
https://tika.apache.org/tika-parser-cad-module/)
+ * Apache Tika code parser module
(org.apache.tika:tika-parser-code-module:4.0.0 -
https://tika.apache.org/tika-parser-code-module/)
+ * Apache Tika core (org.apache.tika:tika-core:4.0.0 -
https://tika.apache.org/)
+ * Apache Tika crypto parser module
(org.apache.tika:tika-parser-crypto-module:4.0.0 -
https://tika.apache.org/tika-parser-crypto-module/)
+ * Apache Tika data URI commons
(org.apache.tika:tika-parser-datauri-commons:4.0.0 -
https://tika.apache.org/tika-parser-datauri-commons/)
+ * Apache Tika digest commons
(org.apache.tika:tika-parser-digest-commons:4.0.0 -
https://tika.apache.org/tika-parser-digest-commons/)
+ * Apache Tika font parser module
(org.apache.tika:tika-parser-font-module:4.0.0 -
https://tika.apache.org/tika-parser-font-module/)
+ * Apache Tika HTML encoding detector
(org.apache.tika:tika-encoding-detector-html:4.0.0 -
https://tika.apache.org/tika-encoding-detectors/tika-encoding-detector-html/)
+ * Apache Tika html parser module
(org.apache.tika:tika-parser-html-module:4.0.0 -
https://tika.apache.org/tika-parser-html-module/)
+ * Apache Tika image parser module
(org.apache.tika:tika-parser-image-module:4.0.0 -
https://tika.apache.org/tika-parser-image-module/)
+ * Apache Tika mail commons
(org.apache.tika:tika-parser-mail-commons:4.0.0 -
https://tika.apache.org/tika-parser-mail-commons/)
+ * Apache Tika mail parser module
(org.apache.tika:tika-parser-mail-module:4.0.0 -
https://tika.apache.org/tika-parser-mail-module/)
+ * Apache Tika Microsoft parser module
(org.apache.tika:tika-parser-microsoft-module:4.0.0 -
https://tika.apache.org/tika-parser-microsoft-module/)
+ * Apache Tika miscellaneous office format parser module
(org.apache.tika:tika-parser-miscoffice-module:4.0.0 -
https://tika.apache.org/tika-parser-miscoffice-module/)
+ * Apache Tika ML charset encoding detector
(org.apache.tika:tika-encoding-detector-mojibuster:4.0.0 -
https://tika.apache.org/tika-encoding-detectors/tika-encoding-detector-mojibuster/)
+ * Apache Tika ML core (no Tika dependencies)
(org.apache.tika:tika-ml-core:4.0.0 - https://tika.apache.org/tika-ml-core/)
+ * Apache Tika ML junk detector — runtime and training tools
(org.apache.tika:tika-ml-junkdetect:4.0.0 -
https://tika.apache.org/tika-ml-junkdetect/)
+ * Apache Tika news parser module
(org.apache.tika:tika-parser-news-module:4.0.0 -
https://tika.apache.org/tika-parser-news-module/)
+ * Apache Tika OCR parser module
(org.apache.tika:tika-parser-ocr-module:4.0.0 -
https://tika.apache.org/tika-parser-ocr-module/)
+ * Apache Tika package parser module
(org.apache.tika:tika-parser-pkg-module:4.0.0 -
https://tika.apache.org/tika-parser-pkg-module/)
+ * Apache Tika PDF parser module
(org.apache.tika:tika-parser-pdf-module:4.0.0 -
https://tika.apache.org/tika-parser-pdf-module/)
+ * Apache Tika serialization (org.apache.tika:tika-serialization:4.0.0
- https://tika.apache.org)
+ * Apache Tika standard parser package
(org.apache.tika:tika-parsers-standard-package:4.0.0 -
https://tika.apache.org/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/)
+ * Apache Tika text parser module
(org.apache.tika:tika-parser-text-module:4.0.0 -
https://tika.apache.org/tika-parser-text-module/)
+ * Apache Tika WARC parser module
(org.apache.tika:tika-parser-webarchive-module:4.0.0 -
https://tika.apache.org/tika-parser-webarchive-module/)
+ * Apache Tika XML parser module
(org.apache.tika:tika-parser-xml-module:4.0.0 -
https://tika.apache.org/tika-parser-xml-module/)
+ * Apache Tika XMP commons
(org.apache.tika:tika-parser-xmp-commons:4.0.0 -
https://tika.apache.org/tika-parser-xmp-commons/)
+ * Apache Tika ZIP commons
(org.apache.tika:tika-parser-zip-commons:4.0.0 -
https://tika.apache.org/tika-parser-zip-commons/)
* Apache Wicket IPageStore Common
(org.wicketstuff:wicketstuff-datastore-common:10.10.0 -
http://wicketstuff.org/datastores-parent/wicketstuff-datastore-common)
* Apache Wicket IPageStore Hazelcast
(org.wicketstuff:wicketstuff-datastore-hazelcast:10.10.0 -
http://wicketstuff.org/datastores-parent/wicketstuff-datastore-hazelcast)
* Apache XBean :: ASM shaded (repackaged)
(org.apache.xbean:xbean-asm9-shaded:4.26 -
http://geronimo.apache.org/maven/xbean/4.26/xbean-asm9-shaded)
- * Apache XmpBox (org.apache.pdfbox:xmpbox:3.0.8 -
https://www.apache.org/pdfbox-parent/xmpbox/)
* Asterisk-Java (org.asteriskjava:asterisk-java:3.42.2 -
https://github.com/asterisk-java/asterisk-java)
* Bootstrap (org.webjars:bootstrap:5.3.8 - http://webjars.org)
* bootstrap-core (de.agilecoders.wicket:wicket-bootstrap-core:7.0.14 -
https://github.com/l0rdn1kk0n/wicket-bootstrap/wicket-bootstrap-core)
@@ -448,7 +448,7 @@ conditions of the following licenses.
* Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.18.4 -
https://bytebuddy.net/byte-buddy)
* Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.9.3 -
https://github.com/ben-manes/caffeine)
* CalDav4j (com.github.caldav4j:caldav4j:1.0.5 -
https://github.com/caldav4j/caldav4j.git)
- * com.drewnoakes:metadata-extractor
(com.drewnoakes:metadata-extractor:2.20.0 - https://drewnoakes.com/code/exif/)
+ * com.drewnoakes:metadata-extractor
(com.drewnoakes:metadata-extractor:2.21.0 - https://drewnoakes.com/code/exif/)
* core (org.kurento:kms-api-core:7.3.0 - https://kurento.openvidu.io/)
* elements (org.kurento:kms-api-elements:7.3.0 -
https://kurento.openvidu.io/)
* error-prone annotations
(com.google.errorprone:error_prone_annotations:2.41.0 -
https://errorprone.info/error_prone_annotations)
@@ -495,8 +495,8 @@ conditions of the following licenses.
* Kurento JSON-RPC Client (org.kurento:kurento-jsonrpc-client:7.3.0 -
https://kurento.openvidu.io/kurento-jsonrpc/kurento-jsonrpc-client/)
* library (de.agilecoders.wicket.webjars:wicket-webjars:4.0.14 -
https://github.com/l0rdn1kk0n/wicket-webjars/wicket-webjars)
* Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:2.0.18 -
http://www.slf4j.org)
- * micrometer-commons (io.micrometer:micrometer-commons:1.16.6 -
https://github.com/micrometer-metrics/micrometer)
- * micrometer-observation (io.micrometer:micrometer-observation:1.16.6
- https://github.com/micrometer-metrics/micrometer)
+ * micrometer-commons (io.micrometer:micrometer-commons:1.16.7 -
https://github.com/micrometer-metrics/micrometer-commercial)
+ * micrometer-observation (io.micrometer:micrometer-observation:1.16.7
- https://github.com/micrometer-metrics/micrometer-commercial)
* Netty/Buffer (io.netty:netty-buffer:4.2.7.Final -
https://netty.io/netty-buffer/)
* Netty/Codec/Base (io.netty:netty-codec-base:4.2.7.Final -
https://netty.io/netty-codec-base/)
* Netty/Codec/Compression
(io.netty:netty-codec-compression:4.2.7.Final -
https://netty.io/netty-codec-compression/)
@@ -543,19 +543,19 @@ conditions of the following licenses.
* rome (com.rometools:rome:2.1.0 - http://rometools.com/rome)
* rome-utils (com.rometools:rome-utils:2.1.0 -
http://rometools.com/rome-utils)
* SparseBitSet (com.zaxxer:SparseBitSet:1.3 -
https://github.com/brettwooldridge/SparseBitSet)
- * Spring AOP (org.springframework:spring-aop:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Beans (org.springframework:spring-beans:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Context (org.springframework:spring-context:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Context Support
(org.springframework:spring-context-support:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Core (org.springframework:spring-core:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Expression Language (SpEL)
(org.springframework:spring-expression:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring JDBC (org.springframework:spring-jdbc:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Object/Relational Mapping
(org.springframework:spring-orm:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Transaction (org.springframework:spring-tx:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Web (org.springframework:spring-web:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * Spring Web MVC (org.springframework:spring-webmvc:7.0.8 -
https://github.com/spring-projects/spring-framework)
- * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.53 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
- * tomcat (org.apache.tomcat:tomcat:11.0.24 -
https://tomcat.apache.org/)
+ * Spring AOP (org.springframework:spring-aop:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Beans (org.springframework:spring-beans:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context (org.springframework:spring-context:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Context Support
(org.springframework:spring-context-support:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Core (org.springframework:spring-core:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Expression Language (SpEL)
(org.springframework:spring-expression:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring JDBC (org.springframework:spring-jdbc:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Object/Relational Mapping
(org.springframework:spring-orm:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Transaction (org.springframework:spring-tx:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web (org.springframework:spring-web:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * Spring Web MVC (org.springframework:spring-webmvc:7.0.9 -
https://github.com/spring-projects/spring-framework)
+ * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.2.54 -
https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
+ * tomcat (org.apache.tomcat:tomcat:11.0.25 -
https://tomcat.apache.org/)
* UNO interface library (org.openoffice:unoil:4.1.2 -
https://wiki.openoffice.org/wiki/Uno)
* Wicket Auth Roles (org.apache.wicket:wicket-auth-roles:10.10.0 -
http://wicket.apache.org/wicket-auth-roles)
* Wicket Core (org.apache.wicket:wicket-core:10.10.0 -
http://wicket.apache.org/wicket-core)
@@ -604,4 +604,4 @@ conditions of the following licenses.
UnRar License
- * Java Unrar (com.github.junrar:junrar:7.6.0 -
https://github.com/junrar/junrar)
+ * Java Unrar (com.github.junrar:junrar:8.1.0 -
https://github.com/junrar/junrar)
diff --git a/openmeetings-core/src/main/java/module-info.java
b/openmeetings-core/src/main/java/module-info.java
index 2bf323ec7..c7870aff5 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -38,6 +38,7 @@ module org.apache.openmeetings.core {
requires org.apache.tika.core;
requires org.apache.tika.parser.image;
+ requires org.apache.tika.serialization;
requires transitive org.apache.openmeetings.db;
requires transitive org.apache.openmeetings.util;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index 02f374d7e..c9413e330 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -30,9 +30,7 @@ import static
org.apache.openmeetings.util.process.ProcessResult.ZERO;
import static org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -50,9 +48,10 @@ import org.apache.openmeetings.util.StoredFile;
import org.apache.openmeetings.util.process.ProcessHelper;
import org.apache.openmeetings.util.process.ProcessResult;
import org.apache.openmeetings.util.process.ProcessResultList;
+import org.apache.tika.config.loader.TikaLoader;
+import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TIFF;
-import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.image.ImageParser;
import org.slf4j.Logger;
@@ -128,10 +127,10 @@ public class ImageConverter extends BaseConverter {
ProcessResult res = new ProcessResult();
res.setProcess("get image dimensions :: " + f.getId());
final Parser parser = new ImageParser();
- try (InputStream is = new FileInputStream(img)) {
+ try (TikaInputStream is = TikaInputStream.get(img)) {
Metadata metadata = new Metadata();
metadata.set(CONTENT_TYPE, mime);
- parser.parse(is, new DefaultHandler(), metadata, new
ParseContext());
+ parser.parse(is, new DefaultHandler(), metadata,
TikaLoader.loadDefault().loadParseContext());
f.setWidth(Integer.valueOf(metadata.get(TIFF.IMAGE_WIDTH)));
f.setHeight(Integer.valueOf(metadata.get(TIFF.IMAGE_LENGTH)));
res.setExitCode(ZERO);
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index cbe53ce25..dad606fa2 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -98,11 +98,16 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-serialization</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/openmeetings-util/src/main/java/module-info.java
b/openmeetings-util/src/main/java/module-info.java
index 60ef5c793..f190aa19d 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -33,6 +33,7 @@ module org.apache.openmeetings.util {
requires transitive org.apache.commons.lang3;
requires org.apache.tika.core;
+ requires org.apache.tika.serialization;
requires org.apache.wicket.util;
requires org.apache.wicket.core;
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
index 2b83e2831..e36741f5b 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
@@ -33,8 +33,7 @@ import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;
-import org.apache.tika.config.TikaConfig;
-import org.apache.tika.exception.TikaException;
+import org.apache.tika.config.loader.TikaLoader;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
@@ -58,7 +57,7 @@ public class StoredFile {
private static final Set<MediaType> CHART_TYPES = new HashSet<>();
private static final Set<MediaType> AS_IS_TYPES = Set.of(MIME_PNG);
private static final String ACCEPT_STRING;
- private static TikaConfig tika;
+ private static TikaLoader tika;
static {
Set<MediaType> types = new LinkedHashSet<>();
types.addAll(CONVERT_TYPES);
@@ -73,12 +72,7 @@ public class StoredFile {
sb.append(',').append(mt.toString());
}
ACCEPT_STRING = sb.toString();
- try {
- tika = new TikaConfig();
- } catch (IOException | TikaException e) {
- log.error("Unexpected exception while initializing
TIKA", e);
- throw new RuntimeException(e);
- }
+ tika = TikaLoader.loadDefault();
}
private String name;
@@ -115,7 +109,7 @@ public class StoredFile {
Metadata md = new Metadata();
md.add(RESOURCE_NAME_KEY, String.format(FILE_NAME_FMT, name,
ext));
try {
- mime = tika.getDetector().detect(is == null ? null :
TikaInputStream.get(is), md);
+ mime = tika.loadDetectors().detect(is == null ? null :
TikaInputStream.get(is), md, tika.loadParseContext());
} catch (Throwable e) {
mime = null;
log.error("Unexpected exception while detecting mime
type", e);
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index 418385cbf..9cb9382b9 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -21,7 +21,7 @@
<hazelcast
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://www.hazelcast.com/schema/config";
- xsi:schemaLocation="http://www.hazelcast.com/schema/config
http://www.hazelcast.com/schema/config/hazelcast-config-5.5.xsd";
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
http://www.hazelcast.com/schema/config/hazelcast-config-5.7.xsd";
>
<map name="ONLINE_USERS_KEY">
<near-cache>
diff --git a/pom.xml b/pom.xml
index 44dedceb3..3d1855b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<api-all.version>2.1.8</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
<jackrabbit-webdav.version>2.21.22</jackrabbit-webdav.version>
- <tika-parsers.version>3.3.2</tika-parsers.version>
+ <tika-parsers.version>4.0.0</tika-parsers.version>
<slf4j.version>2.0.18</slf4j.version>
<logback.version>1.6.3</logback.version>
<license.excludedScopes>test</license.excludedScopes>
@@ -520,12 +520,6 @@
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
<version>${ical4j.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -719,34 +713,18 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
<version>${tika-parsers.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
-
<artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
-
<artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>org.apache.logging.log4j</groupId>
-
<artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>org.apache.logging.log4j</groupId>
-
<artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika-parsers.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-serialization</artifactId>
+ <version>${tika-parsers.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
@@ -757,12 +735,6 @@
<groupId>org.kurento</groupId>
<artifactId>kurento-client</artifactId>
<version>${kurento.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
@@ -850,12 +822,15 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>${commons-dbcp.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <!-- this way we will exclude this one from
dependency tree
+ logging happen via slf4j
+ -->
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>[1.0, )</version> <!-- include all
possible versions -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
