Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrading tika to 2.9.1 to fix SNYK-JAVA-ORGAPACHECOMMONS-6254296 #203

Merged
merged 3 commits into from
Mar 13, 2024
Merged

upgrading tika to 2.9.1 to fix SNYK-JAVA-ORGAPACHECOMMONS-6254296 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
639afb5
upgrading tika to 2.9.1 to fix SNYK-JAVA-ORGAPACHECOMMONS-6254296
srbd Mar 5, 2024
ddd46da
upgrading commons-compress directly rather than tika as latest tika a…
srbd Mar 11, 2024
9b7a400
remove conflict artefacts
srbd Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/extraction/archives/ZipExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ZipExtractor(scratch: ScratchSpace, ingestionServices: IngestionServices)
val extractionRootPath = scratch.createWorkingDir(s"zip/${blob.uri.value}/")
logger.info(s"Running ZIP extractor on '${blob.uri.value}' in temporary working directory '$extractionRootPath'")

val zipFile = new ZipFile(file)
val zipFile = ZipFile.builder().setFile(file).get()
val builder = IngestionContextBuilder(blob.uri, params)

val result = Either.catchNonFatal {
Expand Down
2 changes: 1 addition & 1 deletion backend/app/extraction/email/olm/OlmEmailExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class OlmEmailExtractor(scratch: ScratchSpace, ingestion: IngestionServices) ext

val context = IngestionContextBuilder(blob.uri, params)

val zipFile = new ZipFile(scratchFile)
val zipFile = ZipFile.builder().setFile(scratchFile).get()
logger.info(s"Loaded OLM '${blob.uri.value}'")

try {
Expand Down
1 change: 1 addition & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ lazy val backend = (project in file("backend"))
// (Seems to be OK as of 2.7.0: https://tika.apache.org/2.7.0/parser_guide.html)
"org.apache.tika" % "tika-parsers-standard-package" % "2.7.0",
"org.apache.tika" % "tika-core" % "2.7.0",
"org.apache.commons" % "commons-compress" % "1.26.0",
"org.apache.logging.log4j" % "log4j-to-slf4j" % log4jVersion,
"org.apache.logging.log4j" % "log4j-api" % log4jVersion,
"org.apache.logging.log4j" % "log4j-core" % log4jVersion,
Expand Down
Loading