X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/bf5ba5ba8dbedd92dd557c5269defc29ca98c0b4..23d1501580463868276b0839947091f3fdf5dcf9:/pom.xml

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