Merge branch 'fix/xdocreport' into 'develop'

更新xdocreport

See merge request o2oa/o2oa!378

o2server/pom.xml

@@ -186,11 +186,7 @@
 		</dependency>
 		<dependency>
 			<groupId>fr.opensagres.xdocreport</groupId>
-			<artifactId>fr.opensagres.poi.xwpf.converter.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>fr.opensagres.xdocreport</groupId>
-			<artifactId>fr.opensagres.poi.xwpf.converter.xhtml</artifactId>
+			<artifactId>xdocreport</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tika</groupId>
@@ -694,16 +690,6 @@
 				<artifactId>poi-scratchpad</artifactId>
 				<version>4.1.2</version>
 			</dependency>
-			<dependency>
-				<groupId>fr.opensagres.xdocreport</groupId>
-				<artifactId>fr.opensagres.poi.xwpf.converter.core</artifactId>
-				<version>2.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>fr.opensagres.xdocreport</groupId>
-				<artifactId>fr.opensagres.poi.xwpf.converter.xhtml</artifactId>
-				<version>2.0.1</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.tika</groupId>
 				<artifactId>tika-core</artifactId>
@@ -770,6 +756,11 @@
 				<artifactId>jersey-server</artifactId>
 				<version>2.35</version>
 			</dependency>
+			<dependency>
+				<groupId>fr.opensagres.xdocreport</groupId>
+				<artifactId>xdocreport</artifactId>
+				<version>2.0.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.glassfish.jersey.media</groupId>
 				<artifactId>jersey-media-multipart</artifactId>