From 029887f359919a0cc7b981b6318f0c6594b87766 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Thu, 3 Nov 2022 12:57:29 +0100 Subject: [PATCH] Remove dependencies to POI --- .../com.healthmarketscience.jackcess.bnd | 0 .../org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd | 1 + repackage/org.argeo.tp.utils/tika/merge.bnd | 2 -- sdk/argeo-build | 2 +- sdk/output-argeo-tp-backend.target | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) rename repackage/{org.argeo.tp.utils => org.argeo.tp.poi}/com.healthmarketscience.jackcess.bnd (100%) create mode 100644 repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd diff --git a/repackage/org.argeo.tp.utils/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/com.healthmarketscience.jackcess.bnd rename to repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd new file mode 100644 index 0000000..c315027 --- /dev/null +++ b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd @@ -0,0 +1 @@ +SLC-Origin-M2: org.apache.logging.log4j:log4j-core diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd index 6350726..7a5b16f 100644 --- a/repackage/org.argeo.tp.utils/tika/merge.bnd +++ b/repackage/org.argeo.tp.utils/tika/merge.bnd @@ -12,5 +12,3 @@ org.apache.tika:tika-parser-pdf-module,\ org.apache.tika:tika-parser-image-module,\ org.apache.tika:tika-parser-text-module,\ org.apache.tika:tika-parser-xml-module,\ -org.apache.tika:tika-parser-microsoft-module,\ -org.apache.tika:tika-parser-miscoffice-module,\ \ No newline at end of file diff --git a/sdk/argeo-build b/sdk/argeo-build index a035c5f..8c64cf6 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit a035c5f7a8550c6392a1a2b0686c8d5cc9a97836 +Subproject commit 8c64cf692b20399841a51979ae6d2d4ecb62ebaf diff --git a/sdk/output-argeo-tp-backend.target b/sdk/output-argeo-tp-backend.target index a87e10d..dfd670a 100644 --- a/sdk/output-argeo-tp-backend.target +++ b/sdk/output-argeo-tp-backend.target @@ -4,7 +4,6 @@ - -- 2.30.2