update PoiXwpfV

intracer · Oct 19, 2023 · 27cbfb6 · 27cbfb6
1 parent b387ea4
commit 27cbfb6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -83,8 +83,11 @@ lazy val bots = Project("scalawiki-bots", file("scalawiki-bots"))
     "com.github.pathikrit" %% "better-files" % BetterFilesV,
     "org.rogach" %% "scallop" % ScallopV,
     "org.xwiki.commons" % "xwiki-commons-blame-api" % BlameApiV,
+    Library.Commons.io,
     Library.Poi.scratchpad,
     Library.Poi.ooxml,
+    Library.Poi.ooxmlFull,
+    Library.Poi.poi,
     Library.Poi.converter,
     Library.Play.twirlApi(isScala213.value),
     "com.github.tototoshi" %% "scala-csv" % ScalaCsvV

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -49,13 +49,17 @@ object Dependencies {
     Library.Commons.lang,
     "com.typesafe" % "config" % TypesafeConfigV,
     Library.Poi.ooxml,
+    Library.Poi.poi,
+    Library.Poi.ooxmlFull,
     Library.Jackson.core,
     Library.Jackson.annotations,
     Library.Jackson.databind,
     "joda-time" % "joda-time" % JodaTimeV,
     "org.slf4j" % "slf4j-api" % Slf4jV,
     "ch.qos.logback" % "logback-classic" % LogbackClassicV,
-    "javax.xml.bind" % "jaxb-api" % "2.3.1"
+    "javax.xml.bind" % "jaxb-api" % "2.3.1",
+    "org.apache.logging" % "log4j:log4j-core" % "2.18.1",
+    "org.apache.logging" % "log4j:log4j-api" % "2.18.1"
   )
 
   object Library {
@@ -81,25 +85,30 @@ object Dependencies {
 
       def TwirlV(isScala213: Boolean) = "1.5.2"
 
-      def json(isScala213: Boolean) = "com.typesafe.play" %% "play-json" % PlayJsonV(isScala213)
+      def json(isScala213: Boolean) =
+        "com.typesafe.play" %% "play-json" % PlayJsonV(isScala213)
 
-      def twirlApi(isScala213: Boolean) = "com.typesafe.play" %% "twirl-api" % TwirlV(isScala213)
+      def twirlApi(isScala213: Boolean) =
+        "com.typesafe.play" %% "twirl-api" % TwirlV(isScala213)
     }
 
     object Poi {
       val PoiV = "5.2.3"
-      val PoiXwpfV = "1.0.6"
+      val PoiXwpfV = "2.0.4"
 
       val scratchpad = "org.apache.poi" % "poi-scratchpad" % PoiV
+      val poi = "org.apache.poi" % "poi" % PoiV
       val ooxml = "org.apache.poi" % "poi-ooxml" % PoiV
-      val converter = "fr.opensagres.xdocreport" % "org.apache.poi.xwpf.converter.xhtml" % PoiXwpfV
+      val ooxmlFull = "org.apache.poi" % "poi-ooxml-full" % PoiV
+
+      val converter = "fr.opensagres.xdocreport" % "fr.opensagres.xdocreport.converter.docx.xwpf" % PoiXwpfV
     }
 
     object Commons {
       val CommonsCodecV = "1.16.0"
       val CommonsCompressV = "1.23.0"
       val CommonsLang3V = "3.7"
-      val CommonsIoV = "2.6"
+      val CommonsIoV = "2.7"
 
       val codec = "commons-codec" % "commons-codec" % CommonsCodecV
       val io = "commons-io" % "commons-io" % CommonsIoV
@@ -132,4 +141,4 @@ object Dependencies {
 
   }
 
-}
+}
diff --git a/scalawiki-bots/src/main/scala/org/scalawiki/bots/museum/ImageListParser.scala b/scalawiki-bots/src/main/scala/org/scalawiki/bots/museum/ImageListParser.scala
@@ -1,12 +1,12 @@
 package org.scalawiki.bots.museum
 
-import java.io.{ByteArrayOutputStream, File, FileInputStream}
+import fr.opensagres.poi.xwpf.converter.core.FileURIResolver
+import fr.opensagres.poi.xwpf.converter.xhtml.{XHTMLConverter, XHTMLOptions}
 
+import java.io.{ByteArrayOutputStream, File, FileInputStream}
 import org.apache.poi.ooxml.POIXMLDocument
 import org.apache.poi.hwpf.converter.WordToHtmlConverter
 import org.apache.poi.hwpf.extractor.WordExtractor
-import org.apache.poi.xwpf.converter.core.FileURIResolver
-import org.apache.poi.xwpf.converter.xhtml.{XHTMLConverter, XHTMLOptions}
 import org.apache.poi.xwpf.extractor.XWPFWordExtractor
 import org.apache.poi.xwpf.usermodel.XWPFDocument
 import better.files.{File => SFile}