BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updated version in pom / project files to taxeditor version : 4.2.0 and cdmlib versio...
[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 2138a725c5026eac957c4d4226cbdd8ea7c76180..2cc4ba1f351487e07a657521cf79bcdab01601f4 100644 (file)
--- 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"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+  <parent>\r
+    <groupId>eu.etaxonomy</groupId>\r
+    <artifactId>taxeditor-parent</artifactId>\r
+    <version>4.2.0</version>\r
+  </parent>\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
+  <packaging>eclipse-plugin</packaging>\r
+  <name>CDM Library Dependencies Plugin</name>\r
   <description>CDM Library and dependencies as a plugin</description>\r
 \r
   <build>\r
@@ -21,8 +22,8 @@
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
-    <plugins>
-      <plugin>
+    <plugins>\r
+      <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
         <artifactId>maven-dependency-plugin</artifactId>\r
         <version>2.4</version>\r
@@ -38,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
@@ -64,7 +65,7 @@
               <excludeTransitive>true</excludeTransitive>\r
             </configuration>\r
           </execution>\r
-        </executions>
+        </executions>\r
       </plugin>\r
       <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
@@ -83,14 +84,7 @@
                 <move todir="./src/main/resources/etc/jetty">\r
                   <fileset dir="./src/main/resources/etc/jetty" />\r
                   <mapper type="regexp"\r
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"\r
-                    to="\1\2" />\r
-                </move>\r
-                <move todir="./src/main/resources/etc/jetty">\r
-                  <fileset dir="./src/main/resources/etc/jetty" />\r
-                  <mapper type="regexp"\r
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"\r
-                    to="\1\2" />\r
+                    from="(^cdmlib\-remote\-webapp).*(\.war)" to="\1\2" />\r
                 </move>\r
                 <echo>Update cdmlib jars to SNAPSHOT when build with\r
                   timestamp\r
@@ -98,67 +92,38 @@
                 <move todir="./lib">\r
                   <fileset dir="./lib" />\r
                   <mapper type="regexp"\r
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"\r
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)"\r
                     to="\1SNAPSHOT\2" />\r
                 </move>\r
                 <move todir="./lib">\r
                   <fileset dir="./lib" />\r
                   <mapper type="regexp"\r
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"\r
-                    to="\1SNAPSHOT\2" />                \r
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-sources\.jar)"\r
+                    to="\1SNAPSHOT\2" />\r
                 </move>\r
               </target>\r
             </configuration>\r
           </execution>\r
+          <execution>\r
+            <id>remove-existing-jars</id>\r
+            <phase>clean</phase>\r
+            <goals>\r
+              <goal>run</goal>\r
+            </goals>\r
+            <configuration>\r
+              <target>\r
+                <echo>Remove all cdmlib jars</echo>\r
+                <delete>\r
+                  <fileset dir="./lib" includes="cdmlib-*" />\r
+                </delete>\r
+              </target>\r
+            </configuration>\r
+          </execution>\r
         </executions>\r
       </plugin>\r
     </plugins>\r
   </build>\r
   <profiles>\r
-    <profile>\r
-      <id>cleanCdmlibJars</id>\r
-      <build>\r
-        <plugins>\r
-          <plugin>\r
-            <artifactId>maven-clean-plugin</artifactId>\r
-            <version>2.3</version>\r
-            <configuration>\r
-              <filesets>\r
-                <fileset>\r
-                  <directory>${basedir}/lib</directory>\r
-                  <includes>\r
-                    <include>cdmlib-*</include>\r
-                  </includes>\r
-                  <followSymlinks>false</followSymlinks>\r
-                </fileset>\r
-              </filesets>\r
-            </configuration>\r
-          </plugin>\r
-        </plugins>\r
-      </build>\r
-    </profile>\r
-    <profile>\r
-      <id>cleanAllJars</id>\r
-      <build>\r
-        <plugins>\r
-          <plugin>\r
-            <artifactId>maven-clean-plugin</artifactId>\r
-            <version>2.3</version>\r
-            <configuration>\r
-              <filesets>\r
-                <fileset>\r
-                  <directory>${basedir}/lib</directory>\r
-                  <includes>\r
-                    <include>*</include>\r
-                  </includes>\r
-                  <followSymlinks>false</followSymlinks>\r
-                </fileset>\r
-              </filesets>\r
-            </configuration>\r
-          </plugin>\r
-        </plugins>\r
-      </build>\r
-    </profile>\r
     <profile>\r
       <id>copyAllJars</id>\r
       <build>\r
@@ -212,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
@@ -261,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
@@ -383,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
@@ -469,7 +444,7 @@
     <dependency>\r
       <groupId>com.mchange</groupId>\r
       <artifactId>c3p0</artifactId>\r
-      <version>0.9.2</version>\r
+      <version>${c3p0.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.jboss.spec.javax.transaction</groupId>\r
@@ -593,5 +568,15 @@
       <version>1.1.0.Final</version>\r
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
-  </dependencies>
-</project>
+\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
+