adapt poms to correct handling of versions => move versions to parent pom

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 942517837e87f9907396be8cef57fbca31817328..5930c4181c5db1aa83690cbef29cc9060c833998 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -36,13 +36,6 @@
         <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>
@@ -62,7 +55,6 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>ooxml-schemas</artifactId>
-      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -79,12 +71,10 @@
     <dependency>
         <groupId>org.docx4j</groupId>
         <artifactId>docx4j</artifactId>
-        <version>6.0.1</version>
     </dependency>
     <dependency> 
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
-        <version>2.1</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index e22ae5c700789fd4aa6709f11479697e61d69217..45ff18e3a344f61ef00438c018933f19011112c7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -996,7 +996,16 @@
         <artifactId>poi-ooxml</artifactId>
         <version>${poi.version}</version>
       </dependency>
-
+      <dependency>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>ooxml-schemas</artifactId>
+        <version>1.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.docx4j</groupId>
+        <artifactId>docx4j</artifactId>
+        <version>6.0.1</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.sanselan</groupId>
         <artifactId>sanselan</artifactId>