X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/a52450e2f2051b6bd6577b6f91d10351c41d5237..21e2b938576428e820cf41157e4128569c3baab7:/eu.etaxonomy.taxeditor.cdmlib/pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index f23532844..3d6fd92d2 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
@@ -38,7 +39,7 @@
                 cdmlib-remote-webapp
               </excludeArtifactIds>
               <includeArtifactIds>
-                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote
+                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test
               </includeArtifactIds>
               <outputDirectory>${basedir}/lib</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
@@ -83,8 +84,7 @@
                 <move todir="./src/main/resources/etc/jetty">
                   <fileset dir="./src/main/resources/etc/jetty" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-remote\-webapp).*(\.war)"
-                    to="\1\2" />
+                    from="(^cdmlib\-remote\-webapp).*(\.war)" to="\1\2" />
                 </move>
                 <echo>Update cdmlib jars to SNAPSHOT when build with
                   timestamp
@@ -99,60 +99,31 @@
                   <fileset dir="./lib" />
                   <mapper type="regexp"
                     from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-sources\.jar)"
-                    to="\1SNAPSHOT\2" />                
+                    to="\1SNAPSHOT\2" />
                 </move>
               </target>
             </configuration>
           </execution>
+          <execution>
+            <id>remove-existing-jars</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <echo>Remove all cdmlib jars</echo>
+                <delete>
+                  <fileset dir="./lib" includes="cdmlib-*" />
+                </delete>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <id>cleanCdmlibJars</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${basedir}/lib</directory>
-                  <includes>
-                    <include>cdmlib-*</include>
-                  </includes>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>cleanAllJars</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${basedir}/lib</directory>
-                  <includes>
-                    <include>*</include>
-                  </includes>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>copyAllJars</id>
       <build>
@@ -206,6 +177,11 @@
       </id>
       <url>http://repository.springsource.com/maven/bundles/external
       </url>
+    </repository>
+	 <repository>
+        <id>repository.springsource.release</id>
+        <name>SpringSource GA Repository</name>
+        <url>http://repo.springsource.org/release</url>
     </repository>
   </repositories>
   <dependencies>
@@ -255,58 +231,11 @@
       <artifactId>cdmlib-ext</artifactId>
       <version>${cdmlib.version}</version>
     </dependency>
-
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-server</artifactId> -->
-    <!-- <version>9.1.3.v20140225</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-util</artifactId> -->
-    <!-- <version>9.1.3.v20140225</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-xml</artifactId> -->
-    <!-- <version>9.1.3.v20140225</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-servlet</artifactId> -->
-    <!-- <version>9.1.3.v20140225</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-webapp</artifactId> -->
-    <!-- <version>9.1.3.v20140225</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-security</artifactId> -->
-    <!-- <version>9.1.3.v20140225</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-http</artifactId> -->
-    <!-- <version>${jetty.version}</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>org.eclipse.jetty</groupId> -->
-    <!-- <artifactId>jetty-io</artifactId> -->
-    <!-- <version>${jetty.version}</version> -->
-    <!-- </dependency> -->
-    <!-- <dependency> -->
-    <!-- <groupId>javax.servlet</groupId> -->
-    <!-- <artifactId>javax.servlet-api</artifactId> -->
-    <!-- <version>3.1.0</version> -->
-    <!-- </dependency> -->
-
-    <!-- <dependency> -->
-    <!-- <groupId>javax.servlet</groupId> -->
-    <!-- <artifactId>jsp-api</artifactId> -->
-    <!-- <version>2.0</version> -->
-    <!-- </dependency> -->
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-test</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>net.sf.ehcache</groupId>
@@ -377,78 +306,78 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context.support</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-context</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.aspects</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.test</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-aspects</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.beans</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-test</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.transaction</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-beans</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.web</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-tx</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.core</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.aop</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-core</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.expression</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-aop</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.orm</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-expression</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
+   <dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-orm</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.jdbc</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-jdbc</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>3.1.3.RELEASE</version>
+      <version>4.0.3.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>3.1.3.RELEASE</version>
+      <version>4.0.3.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-remoting</artifactId>
-      <version>3.1.3.RELEASE</version>
+      <version>4.0.3.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -460,11 +389,6 @@
       <artifactId>hamcrest-core</artifactId>
       <version>1.3</version>
     </dependency>
-    <dependency>
-      <groupId>com.mchange</groupId>
-      <artifactId>c3p0</artifactId>
-      <version>0.9.2</version>
-    </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.transaction</groupId>
       <artifactId>jboss-transaction-api_1.1_spec</artifactId>
@@ -527,22 +451,8 @@
     </dependency>
 
     <!-- For Unit Tests Start -->
+	<!-- still needed? -->
 
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-core</artifactId>
-      <version>3.4.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-spring</artifactId>
-      <version>3.4.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-database</artifactId>
-      <version>3.4.2</version>
-    </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
@@ -553,26 +463,8 @@
       <artifactId>commons-pool</artifactId>
       <version>1.5.4</version>
     </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-dbmaintainer</artifactId>
-      <version>3.4.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.181</version>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-dbunit</artifactId>
-      <version>3.4.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <version>2.4.9</version>
-    </dependency>
+
+ 
     <!-- For Unit Tests End -->
 
     <!-- For Hibernate Mapping Start -->
@@ -588,5 +480,13 @@
     </dependency>
     <!-- For Hibernate Mapping End -->
 
+	<dependency>
+		<groupId>com.itextpdf</groupId>
+		<artifactId>itextpdf</artifactId>
+		<version>5.5.8</version>
+		<scope>compile</scope>
+	</dependency>
+
   </dependencies>
 </project>
+