Merge branch 'release/4.7.0'

[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 4d33f040f743932135a21cc6950ebe722cabb913..f11ee682b5b07bf796bf583f829eb528b2f20607 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>4.3.0-SNAPSHOT</version>\r
+    <version>4.7.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
@@ -237,58 +237,6 @@
       <version>${cdmlib.version}</version>\r
     </dependency>\r
 \r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-server</artifactId> -->\r
-    <!-- <version>9.1.3.v20140225</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-util</artifactId> -->\r
-    <!-- <version>9.1.3.v20140225</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-xml</artifactId> -->\r
-    <!-- <version>9.1.3.v20140225</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-servlet</artifactId> -->\r
-    <!-- <version>9.1.3.v20140225</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-webapp</artifactId> -->\r
-    <!-- <version>9.1.3.v20140225</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-security</artifactId> -->\r
-    <!-- <version>9.1.3.v20140225</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-http</artifactId> -->\r
-    <!-- <version>${jetty.version}</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-    <!-- <artifactId>jetty-io</artifactId> -->\r
-    <!-- <version>${jetty.version}</version> -->\r
-    <!-- </dependency> -->\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>javax.servlet</groupId> -->\r
-    <!-- <artifactId>javax.servlet-api</artifactId> -->\r
-    <!-- <version>3.1.0</version> -->\r
-    <!-- </dependency> -->\r
-\r
-    <!-- <dependency> -->\r
-    <!-- <groupId>javax.servlet</groupId> -->\r
-    <!-- <artifactId>jsp-api</artifactId> -->\r
-    <!-- <version>2.0</version> -->\r
-    <!-- </dependency> -->\r
-\r
     <dependency>\r
       <groupId>net.sf.ehcache</groupId>\r
       <artifactId>ehcache-core</artifactId>\r
@@ -515,12 +463,6 @@
       <artifactId>commons-pool</artifactId>\r
       <version>1.5.4</version>\r
     </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-model</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-\r
  \r
     <!-- For Unit Tests End -->\r
 \r
@@ -536,15 +478,7 @@
       <version>1.1.0.Final</version>\r
     </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
-
+\r