Merge branch 'dependabot/maven/1.1.x/org.docx4j-docx4j-export-fo-8.2.…

…0' into 1.1.x
paulcwarren · Jun 5, 2020 · 43c9e2b · 43c9e2b
2 parents 7470a69 + 73a22ce
commit 43c9e2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 41 deletions.
diff --git a/...ngframework/content/renditions/boot/autoconfigure/RenditionsContentAutoConfiguration.java b/...ngframework/content/renditions/boot/autoconfigure/RenditionsContentAutoConfiguration.java
@@ -17,5 +17,4 @@ public class RenditionsContentAutoConfiguration {
     public static class Docx4jAutoConfiguration {
         //
     }
-
 }
diff --git a/spring-content-docx4j/pom.xml b/spring-content-docx4j/pom.xml
@@ -19,77 +19,43 @@
 
 		<dependency>
 			<groupId>org.docx4j</groupId>
-			<artifactId>docx4j</artifactId>
-			<version>6.1.2</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-codec</groupId>
-					<artifactId>commons-codec</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xalan</groupId>
-					<artifactId>xalan</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>docx4j-core</artifactId>
+			<version>8.2.0</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.docx4j</groupId>
 			<artifactId>docx4j-export-fo</artifactId>
-			<version>6.1.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.14</version>
+			<version>8.2.0</version>
 		</dependency>
-
 		<dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-			<version>2.7.2</version>
-			<exclusions>
-				<exclusion>
-					<groupId>xml-apis</groupId>
-					<artifactId>xml-apis</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>xml-apis</groupId>
-			<artifactId>xml-apis</artifactId>
-			<version>2.0.2</version>
+			<groupId>org.docx4j</groupId>
+			<artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
+			<version>8.2.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
 			<artifactId>ginkgo4j</artifactId>
 			<version>${ginkgo4j-version}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-all</artifactId>
 			<version>1.3</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
 			<version>1.13.1</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>