From 915041714f3491e29de4afa2e206eaf349a403c2 Mon Sep 17 00:00:00 2001 From: kwatters Date: Tue, 1 Aug 2023 16:36:00 -0400 Subject: [PATCH 1/2] regenerating the pom and excluding logging dependencies from tika imports. --- pom.xml | 72 ++++++++++++++----- .../service/meta/DocumentPipelineMeta.java | 12 ++++ .../org/myrobotlab/service/meta/Py4jMeta.java | 4 +- 3 files changed, 70 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 51a199ce89..88df131fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -163,10 +163,6 @@ - - - - org.boofcv @@ -305,18 +301,62 @@ - - - org.apache.tika - tika-core - 2.8.0 - - - org.apache.tika - tika-parser-audiovideo-module - 2.8.0 - - + + org.apache.tika + tika-core + 2.8.0 + provided + + + org.slf4j + * + + + log4j + * + + + org.apache.logging.log4j + * + + + com.fasterxml.jackson.core + * + + + io.netty + * + + + + + org.apache.tika + tika-parser-audiovideo-module + 2.8.0 + provided + + + org.slf4j + * + + + log4j + * + + + org.apache.logging.log4j + * + + + com.fasterxml.jackson.core + * + + + io.netty + * + + + org.apache.opennlp opennlp-tools diff --git a/src/main/java/org/myrobotlab/service/meta/DocumentPipelineMeta.java b/src/main/java/org/myrobotlab/service/meta/DocumentPipelineMeta.java index 3ec1139e97..3a179e93be 100644 --- a/src/main/java/org/myrobotlab/service/meta/DocumentPipelineMeta.java +++ b/src/main/java/org/myrobotlab/service/meta/DocumentPipelineMeta.java @@ -17,7 +17,19 @@ public DocumentPipelineMeta() { addDescription("This service will pass a document through a document processing pipeline made up of transformers"); addCategory("ingest"); addDependency("org.apache.tika", "tika-core", "2.8.0"); + exclude("org.slf4j", "*"); + exclude("log4j", "*"); + exclude("org.apache.logging.log4j", "*"); + exclude("com.fasterxml.jackson.core", "*"); + exclude("io.netty", "*"); + addDependency("org.apache.tika", "tika-parser-audiovideo-module", "2.8.0"); + exclude("org.slf4j", "*"); + exclude("log4j", "*"); + exclude("org.apache.logging.log4j", "*"); + exclude("com.fasterxml.jackson.core", "*"); + exclude("io.netty", "*"); + addDependency("org.apache.opennlp", "opennlp-tools", "1.6.0"); addDependency("net.objecthunter", "exp4j", "0.4.8"); diff --git a/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java b/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java index def9039a53..f0a36ea333 100644 --- a/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java +++ b/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java @@ -22,8 +22,8 @@ public Py4jMeta() { // Used just as a Python exe redistributable. // ABSOLUTELY NO JNI/JNA IS USED - addDependency("org.bytedeco", "cpython-platform", "3.10.8-1.5.8"); - addDependency("org.bytedeco", "cpython", "3.10.8-1.5.8"); + addDependency("org.bytedeco", "cpython-platform", "3.11.3-1.5.9"); + addDependency("org.bytedeco", "cpython", "3.11.3-1.5.9"); } } From 41688a3f820b5668a1968894efb4213091a6f7d8 Mon Sep 17 00:00:00 2001 From: kwatters Date: Tue, 1 Aug 2023 17:08:17 -0400 Subject: [PATCH 2/2] reverting py4j update --- pom.xml | 4 ++-- src/main/java/org/myrobotlab/service/meta/Py4jMeta.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 88df131fb3..02b55ea8ac 100644 --- a/pom.xml +++ b/pom.xml @@ -1283,13 +1283,13 @@ org.bytedeco cpython-platform - 3.11.3-1.5.9 + 3.10.8-1.5.8 provided org.bytedeco cpython - 3.11.3-1.5.9 + 3.10.8-1.5.8 provided diff --git a/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java b/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java index f0a36ea333..def9039a53 100644 --- a/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java +++ b/src/main/java/org/myrobotlab/service/meta/Py4jMeta.java @@ -22,8 +22,8 @@ public Py4jMeta() { // Used just as a Python exe redistributable. // ABSOLUTELY NO JNI/JNA IS USED - addDependency("org.bytedeco", "cpython-platform", "3.11.3-1.5.9"); - addDependency("org.bytedeco", "cpython", "3.11.3-1.5.9"); + addDependency("org.bytedeco", "cpython-platform", "3.10.8-1.5.8"); + addDependency("org.bytedeco", "cpython", "3.10.8-1.5.8"); } }