minor

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index afff06de796d185407c7ab322d4612a1facfdb1d..c89ce7961cdf008ebb47a4c415d5b9fa0aa13332 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
        <modelVersion>4.0.0</modelVersion>\r
        <groupId>eu.etaxonomy</groupId>\r
        <artifactId>cdmlib-parent</artifactId>\r
-       <version>2.3</version>\r
+       <version>2.4</version>\r
 \r
        <name>CDM Library</name>\r
        <description>The CDM Library implementation for EDIT's internet platform for cybertaxonomy</description>\r
@@ -20,12 +20,14 @@
                <module>cdmlib-services</module>\r
                <module>cdmlib-ext</module>\r
                <module>cdmlib-remote</module>\r
-    <!-- <module>cdm-server</module> -->\r
+               <module>cdmlib-print</module>\r
+               <module>cdmlib-remote-webapp</module>\r
+               <module>cdm-server</module>\r
                <module>cdmlib-io</module>\r
        </modules>\r
   \r
   <properties>\r
-    <spring.version>3.0.0.RC1</spring.version>\r
+    <spring.version>3.0.0.RELEASE</spring.version>\r
   </properties>\r
   <scm>\r
     <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>\r
@@ -111,23 +113,6 @@
                        <url></url>\r
                </developer>\r
                \r
-               <developer>\r
-                       <!-- your SVN account id please! -->\r
-                       <id>p.ciardelli</id>\r
-                       <name>\r
-                               Pepe Ciardelli\r
-                       </name>\r
-                       <email>p.ciardelli [at] bgbm.org</email>\r
-                       <organization>\r
-                               Botanical Garden Botanical Museum Berlin\r
-                       </organization>\r
-                       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>\r
-                       <timezone>+1</timezone>\r
-                       <roles>\r
-                               <role>developer</role>\r
-                       </roles>\r
-                       <url></url>\r
-               </developer>\r
                <developer>\r
                        <!-- your SVN account id please! -->\r
                        <id>k.luther</id>\r
@@ -147,11 +132,11 @@
                </developer>\r
                <developer>\r
                        <!-- your SVN account id please! -->\r
-                       <id>a.babadshanjan</id>\r
+                       <id>n.hoffmann</id>\r
                        <name>\r
-                               Anahit Babadshanjan\r
+                               Niels Hoffmann\r
                        </name>\r
-                       <email>A.Babadshanjan [at] bgbm.org</email>\r
+                       <email>n.hoffmann [at] bgbm.org</email>\r
                        <organization>\r
                                Botanic Garden Botanical Museum Berlin\r
                        </organization>\r
@@ -164,38 +149,39 @@
                </developer>\r
                <developer>\r
                        <!-- your SVN account id please! -->\r
-                       <id>n.hoffmann</id>\r
+                       <id>ben.clark</id>\r
                        <name>\r
-                               Niels Hoffmann\r
+                               Ben Clark\r
                        </name>\r
-                       <email>n.hoffmann [at] bgbm.org</email>\r
+                       <email>b.clark [at] kew.org</email>\r
                        <organization>\r
-                               Botanic Garden Botanical Museum Berlin\r
+                               Royal Botanic Gardens, Kew\r
                        </organization>\r
-                       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>\r
-                       <timezone>+1</timezone>\r
+                       <organizationUrl>http://www.kew.org/computing/</organizationUrl>\r
+                       <timezone>0</timezone>\r
                        <roles>\r
                                <role>developer</role>\r
                        </roles>\r
                        <url></url>\r
                </developer>\r
-               <developer>\r
+                               <developer>\r
                        <!-- your SVN account id please! -->\r
-                       <id>ben.clark</id>\r
+                       <id>em.lee</id>\r
                        <name>\r
-                               Ben Clark\r
+                               Eun-Mok Lee\r
                        </name>\r
-                       <email>b.clark [at] kew.org</email>\r
+                       <email>e.-m.lee [at] bgbm.org</email>\r
                        <organization>\r
-                               Royal Botanic Gardens, Kew\r
+                               Botanical Garden Botanical Museum Berlin\r
                        </organization>\r
-                       <organizationUrl>http://www.kew.org/computing/</organizationUrl>\r
-                       <timezone>0</timezone>\r
+                       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>\r
+                       <timezone>+1</timezone>\r
                        <roles>\r
                                <role>developer</role>\r
                        </roles>\r
                        <url></url>\r
                </developer>\r
+\r
        </developers>\r
        <contributors>\r
                <contributor>\r
@@ -267,8 +253,8 @@
                <plugin>\r
                        <artifactId>maven-compiler-plugin</artifactId>\r
                        <configuration>\r
-                         <source>1.5</source>\r
-                         <target>1.5</target>\r
+                         <source>1.6</source>\r
+                         <target>1.6</target>\r
                        </configuration>\r
                      </plugin>\r
                      <plugin>\r
@@ -304,7 +290,7 @@
         <version>1.0-beta-3</version>\r
         <executions>\r
           <execution>\r
-            <phase>deploy</phase>\r
+            <!--<phase>deploy</phase>-->\r
             <goals>\r
               <goal>create</goal>\r
             </goals>\r
@@ -457,7 +443,7 @@
                                <artifactId>maven-javadoc-plugin</artifactId>\r
                                <configuration>\r
                                        <links>\r
-                                               <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>\r
+                                               <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>\r
                                                <link>http://static.springframework.org/spring/docs/2.5.x/api/</link>\r
                                                <link>http://www.hibernate.org/hib_docs/v3/api/</link>                                          \r
                                                <!-- more libraries? -->\r
@@ -844,11 +830,11 @@
                                         <groupId>org.springframework</groupId>\r
                                         <artifactId>spring-context</artifactId>\r
                                 </exclusion>\r
- <exclusion>\r
+         <exclusion>\r
                                         <groupId>org.springframework</groupId>\r
                                         <artifactId>spring-core</artifactId>\r
                                 </exclusion>\r
- <exclusion>\r
+         <exclusion>\r
                                         <groupId>org.springframework</groupId>\r
                                         <artifactId>spring-jdbc</artifactId>\r
                                 </exclusion>\r
@@ -1039,6 +1025,16 @@
                   <artifactId>org.springframework.agent</artifactId>\r
                   <version>${spring.version}</version>\r
                 </dependency>\r
+                <dependency>\r
+                  <groupId>org.springframework</groupId>\r
+                  <artifactId>org.springframework.context.support</artifactId>\r
+                  <version>${spring.version}</version>\r
+                </dependency>\r
+                <dependency>\r
+                  <groupId>org.springframework</groupId>\r
+                  <artifactId>org.springframework.oxm</artifactId>\r
+                  <version>${spring.version}</version>\r
+                </dependency>\r
                 <dependency>\r
                   <groupId>org.springframework</groupId>\r
                   <artifactId>org.springframework.context.support</artifactId>\r