Add newer itextpdf dependency to avoid conflict with itextpdf 5.0.2 from

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index c261a449bf53223b1a5a039c440627f240b73219..d0d5a0ef9ef47f65385e58b266bec2d6e7f9ef0d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.12.2</version>\r
+    <version>3.13.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
@@ -39,7 +39,7 @@
                 cdmlib-remote-webapp\r
               </excludeArtifactIds>\r
               <includeArtifactIds>\r
-                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote\r
+                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test\r
               </includeArtifactIds>\r
               <outputDirectory>${basedir}/lib</outputDirectory>\r
               <overWriteReleases>true</overWriteReleases>\r
@@ -177,6 +177,11 @@
       </id>\r
       <url>http://repository.springsource.com/maven/bundles/external\r
       </url>\r
+    </repository>\r
+        <repository>\r
+        <id>repository.springsource.release</id>\r
+        <name>SpringSource GA Repository</name>\r
+        <url>http://repo.springsource.org/release</url>\r
     </repository>\r
   </repositories>\r
   <dependencies>\r
@@ -226,6 +231,11 @@
       <artifactId>cdmlib-ext</artifactId>\r
       <version>${cdmlib.version}</version>\r
     </dependency>\r
+    <dependency>\r
+      <groupId>eu.etaxonomy</groupId>\r
+      <artifactId>cdmlib-test</artifactId>\r
+      <version>${cdmlib.version}</version>\r
+    </dependency>\r
 \r
     <!-- <dependency> -->\r
     <!-- <groupId>org.eclipse.jetty</groupId> -->\r
@@ -348,78 +358,78 @@
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.context</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-context</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.context.support</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-context-support</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.aspects</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-aspects</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.test</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-test</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.beans</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-beans</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.transaction</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-tx</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.web</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
-    </dependency>\r
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-web</artifactId>\r
+               <version>4.2.4.RELEASE</version>\r
+       </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.core</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-core</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.aop</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
+      <artifactId>spring-aop</artifactId>\r
+      <version>4.2.4.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.expression</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
-    </dependency>\r
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-expression</artifactId>\r
+               <version>4.2.4.RELEASE</version>\r
+       </dependency>\r
+   <dependency>\r
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-orm</artifactId>\r
+               <version>4.2.4.RELEASE</version>\r
+       </dependency>\r
     <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.orm</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.springframework</groupId>\r
-      <artifactId>org.springframework.jdbc</artifactId>\r
-      <version>3.2.2.RELEASE</version>\r
-    </dependency>\r
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-jdbc</artifactId>\r
+               <version>4.2.4.RELEASE</version>\r
+       </dependency>\r
     <dependency>\r
       <groupId>org.springframework.security</groupId>\r
       <artifactId>spring-security-core</artifactId>\r
-      <version>3.1.3.RELEASE</version>\r
+      <version>4.0.3.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework.security</groupId>\r
       <artifactId>spring-security-config</artifactId>\r
-      <version>3.1.3.RELEASE</version>\r
+      <version>4.0.3.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework.security</groupId>\r
       <artifactId>spring-security-remoting</artifactId>\r
-      <version>3.1.3.RELEASE</version>\r
+      <version>4.0.3.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.jboss.logging</groupId>\r
@@ -559,6 +569,14 @@
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
 \r
+       <dependency>\r
+               <groupId>com.itextpdf</groupId>\r
+               <artifactId>itextpdf</artifactId>\r
+               <version>5.5.8</version>\r
+               <scope>compile</scope>\r
+       </dependency>\r
+    \r
+\r
   </dependencies>\r
 </project>\r