You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2022/09/26 11:49:57 UTC
[servicemix-bundles] branch master updated: Fix POI-5.2.2
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new 4edf30733 Fix POI-5.2.2
new cb43e36b2 Merge pull request #183 from j3rem1e/fix-poi
4edf30733 is described below
commit 4edf30733eb77c0ca5b2397243079ff8c9bb574c
Author: j3rem1e <je...@gmail.com>
AuthorDate: Wed Sep 7 18:33:17 2022 +0200
Fix POI-5.2.2
Package META-INF/services files
Exclude log4j API
---
poi-5.2.2/pom.xml | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/poi-5.2.2/pom.xml b/poi-5.2.2/pom.xml
index ac713c112..0464660c7 100644
--- a/poi-5.2.2/pom.xml
+++ b/poi-5.2.2/pom.xml
@@ -92,6 +92,7 @@
org.apache.commons.collections4.*,
org.apache.commons.math3.*,
org.apache.commons.compress.*,
+ org.apache.logging.*,
org.bouncycastle.*;resolution:=optional,
org.apache.jcp.xml.dsig.internal.dom;resolution:=optional,
org.apache.xml.security.*;resolution:=optional,
@@ -258,34 +259,44 @@
<excludes>
<exclude>*:*:*:sources</exclude>
<exclude>${project.groupId}:${project.artifactId}:*:sources</exclude>
+ <exclude>org.apache.logging.log4j:*</exclude>
</excludes>
</artifactSet>
<filters>
- <filter>
+ <filter>
<artifact>${pkgGroupId}:poi</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
+ </filter>
<filter>
<artifact>${pkgGroupId}:poi-scratchpad</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
</filter>
<filter>
<artifact>${pkgGroupId}:poi-ooxml</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:poi-ooxml-lite</artifact>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
</filter>
<filter>
<artifact>com.github.virtuald:curvesapi</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
</filter>
</filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ </transformers>
<promoteTransitiveDependencies>false</promoteTransitiveDependencies>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>