You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/10 15:41:35 UTC

[isis] branch ISIS-2442 updated: ISIS-2442: resolves dependency convergence issue within docx4j itself

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2442
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/ISIS-2442 by this push:
     new e5f16ee  ISIS-2442: resolves dependency convergence issue within docx4j itself
e5f16ee is described below

commit e5f16eeebe268a837c75489be23fdfbb99997838
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jun 10 16:41:06 2021 +0100

    ISIS-2442: resolves dependency convergence issue within docx4j itself
---
 subdomains/docx/applib/pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/subdomains/docx/applib/pom.xml b/subdomains/docx/applib/pom.xml
index 27f335e..8ae99f6 100644
--- a/subdomains/docx/applib/pom.xml
+++ b/subdomains/docx/applib/pom.xml
@@ -68,5 +68,28 @@
 		</dependency>
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>dependency-convergence</id>
+			<activation>
+				<property>
+					<name>!skip.dependency-convergence</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.docx4j</groupId>
+					<artifactId>docx4j-core</artifactId>
+					<version>${docx4j.version}</version>
+					<exclusions>
+						<exclusion>
+							<groupId>org.apache.xmlgraphics</groupId>
+							<artifactId>xmlgraphics-commons</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 
 </project>