Updating develop poms back to pre merge state

[cdmlib.git] / cdmlib-io / pom.xml

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index b1502118bffbb2c7b21f922fd88d370d4d2c9143..ca29ce2ad3a5178a72f21d8acab03f7aa1ef15b2 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.7.0-SNAPSHOT</version>
+    <version>5.37.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -18,7 +18,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.2.2</version>
         <executions>
           <execution>
             <goals>
@@ -34,15 +34,7 @@
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-test</artifactId>
         <scope>test</scope>
-        <version>${project.version}</version>
     </dependency>
-<!--     <dependency> -->
-<!--       <groupId>eu.etaxonomy</groupId> -->
-<!--       <artifactId>cdmlib-persistence</artifactId> -->
-<!--       <type>test-jar</type> -->
-<!--       <scope>test</scope> -->
-<!--       <version>${project.version}</version> -->
-<!--     </dependency> -->
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-ext</artifactId>
@@ -55,15 +47,6 @@
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>ooxml-schemas</artifactId>
-      <version>1.4</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-oxm</artifactId>
@@ -71,20 +54,34 @@
     <dependency>
       <groupId>identificationKeyAPI</groupId>
       <artifactId>identificationKeyAPI</artifactId>
+<!--       <exclusions> -->
+<!--         <exclusion> -->
+<!--           <groupId>xml-apis</groupId> -->
+<!--           <artifactId>xml-apis</artifactId> -->
+<!--         </exclusion> -->
+<!--       </exclusions> -->
     </dependency>
     <dependency>
                <groupId>org.apache.jena</groupId>
-               <artifactId>jena-tdb</artifactId>       
+               <artifactId>jena-tdb</artifactId>
+               <exclusions>
+                 <exclusion>
+                   <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+                 </exclusion>
+                 <exclusion>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+               </exclusions>
        </dependency>
     <dependency>
-        <groupId>org.docx4j</groupId>
-        <artifactId>docx4j</artifactId>
-        <version>6.0.1</version>
+      <groupId>org.docx4j</groupId>
+      <artifactId>docx4j-JAXB-Internal</artifactId>
     </dependency>
-    <dependency> 
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.1</version>
+    <dependency>
+      <groupId>xml-resolver</groupId>
+      <artifactId>xml-resolver</artifactId>
     </dependency>
   </dependencies>
 </project>