X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/d637e4bab9be3f8bb6d7192555593a71e3f3a4e3..2016e6e8752c5dcbe008e58b2f68add33e16d677:/eu.etaxonomy.taxeditor.cdmlib/pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 2138a725c..08984ab2b 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,14 +1,15 @@
-<?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">
-  <parent>
-    <groupId>eu.etaxonomy</groupId>
-    <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <name>CDM Library Dependencies Plugin</name>
+<?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">
+  <parent>
+    <groupId>eu.etaxonomy</groupId>
+    <artifactId>taxeditor-parent</artifactId>
+    <version>4.2.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <name>CDM Library Dependencies Plugin</name>
   <description>CDM Library and dependencies as a plugin</description>
 
   <build>
@@ -21,8 +22,8 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
+    <plugins>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>2.4</version>
@@ -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>
@@ -64,7 +65,7 @@
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
-        </executions>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -83,14 +84,7 @@
                 <move todir="./src/main/resources/etc/jetty">
                   <fileset dir="./src/main/resources/etc/jetty" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"
-                    to="\1\2" />
-                </move>
-                <move todir="./src/main/resources/etc/jetty">
-                  <fileset dir="./src/main/resources/etc/jetty" />
-                  <mapper type="regexp"
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"
-                    to="\1\2" />
+                    from="(^cdmlib\-remote\-webapp).*(\.war)" to="\1\2" />
                 </move>
                 <echo>Update cdmlib jars to SNAPSHOT when build with
                   timestamp
@@ -98,67 +92,38 @@
                 <move todir="./lib">
                   <fileset dir="./lib" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)"
                     to="\1SNAPSHOT\2" />
                 </move>
                 <move todir="./lib">
                   <fileset dir="./lib" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"
-                    to="\1SNAPSHOT\2" />                
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-sources\.jar)"
+                    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>
@@ -212,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>
@@ -261,6 +231,11 @@
       <artifactId>cdmlib-ext</artifactId>
       <version>${cdmlib.version}</version>
     </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-test</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
 
     <!-- <dependency> -->
     <!-- <groupId>org.eclipse.jetty</groupId> -->
@@ -383,78 +358,78 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context</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.context.support</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.aspects</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.test</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.beans</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.transaction</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.web</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.core</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.aop</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.expression</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.orm</artifactId>
-      <version>3.2.2.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>
@@ -469,7 +444,7 @@
     <dependency>
       <groupId>com.mchange</groupId>
       <artifactId>c3p0</artifactId>
-      <version>0.9.2</version>
+      <version>${c3p0.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.transaction</groupId>
@@ -593,5 +568,15 @@
       <version>1.1.0.Final</version>
     </dependency>
     <!-- For Hibernate Mapping End -->
-  </dependencies>
-</project>
+
+	<dependency>
+		<groupId>com.itextpdf</groupId>
+		<artifactId>itextpdf</artifactId>
+		<version>5.5.8</version>
+		<scope>compile</scope>
+	</dependency>
+    
+
+  </dependencies>
+</project>
+