<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
<module>cdmlib-services</module>\r
<module>cdmlib-ext</module>\r
<module>cdmlib-remote</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
-\r
+ <scm>\r
+ <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>\r
+ <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/</developerConnection>\r
+ <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/</url>\r
+ </scm>\r
\r
<mailingLists>\r
<mailingList>\r
<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
</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
</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
<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
<artifactId>maven-surefire-plugin</artifactId>\r
<configuration>\r
<argLine>-Xmx512M</argLine>\r
- <includes>\r
- <include>**/*Test.java</include>\r
- </includes>\r
+ <includes>\r
+ <include>**/*Test.java</include>\r
+ </includes>\r
<systemProperties>\r
<property>\r
<name>hibernate.connection.driver_class</name>\r
<name>hibernate.connection.password</name>\r
<value>${hibernate.connection.password}</value>\r
</property>\r
- \r
</systemProperties>\r
</configuration>\r
- </plugin>\r
- <plugin>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.codehaus.mojo</groupId>\r
+ <artifactId>buildnumber-maven-plugin</artifactId>\r
+ <version>1.0-beta-3</version>\r
+ <executions>\r
+ <execution>\r
+ <!--<phase>deploy</phase>-->\r
+ <goals>\r
+ <goal>create</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ <configuration>\r
+ <doCheck>false</doCheck><!-- Only create the build number if there are no local modifications -->\r
+ <doUpdate>false</doUpdate><!-- automatically update the local svn copy -->\r
+ </configuration>\r
+ </plugin>\r
+ <plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-site-plugin</artifactId>\r
<!-- \r
<downloadJavadocs>true</downloadJavadocs> \r
</configuration>\r
</plugin>\r
+ <plugin>\r
<groupId>com.agilejava.docbkx</groupId>\r
<artifactId>docbkx-maven-plugin</artifactId>\r
<version>2.0.9</version>\r
<htmlStylesheet>resources/css/html.css</htmlStylesheet>\r
<xincludeSupported>true</xincludeSupported>\r
<!--<htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>-->\r
- <!-- if anyone can get the xsl-fo customization to work properly, then by all \r
- means use it\r
- <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>\r
- -->\r
+ <!-- if anyone can get the xsl-fo customization to work properly, then by all \r
+ means use it\r
+ <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>\r
+ -->\r
<entities>\r
<entity>\r
<name>version</name>\r
<value>${pom.version}</value>\r
</entity>\r
</entities>\r
- <!--We want the final documentation and the required resources to end up in \r
- the right place-->\r
+ <!--We want the final documentation and the required resources to end up in \r
+ the right place-->\r
<postProcess>\r
<copy todir="target/site/reference">\r
<fileset dir="target/docbkx">\r
<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
<distributionManagement>\r
<site>\r
<id>edit-wp5</id>\r
- <url>\r
- scp://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/site\r
+ <url>\r
+ scp://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/site\r
</url>\r
</site>\r
<repository>\r
<id>edit-wp5</id>\r
<name>Edit Maven Repository</name>\r
<url>\r
- scp://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/mavenrepo\r
+ scp://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/mavenrepo\r
</url>\r
</repository>\r
</distributionManagement>\r
<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
<artifactId>hibernate-ehcache</artifactId>\r
<version>3.4.0-SNAPSHOT</version>\r
</dependency>\r
- <dependency>\r
+ <dependency>\r
<groupId>org.hibernate</groupId>\r
<artifactId>hibernate-parent</artifactId>\r
<version>3.4.0-SNAPSHOT</version>\r
</dependency>\r
- <dependency>\r
- <groupId>javax.servlet</groupId>\r
- <artifactId>servlet-api</artifactId>\r
- <version>2.5</version>\r
- </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-c3p0</artifactId>\r
+ <version>3.4.0-SNAPSHOT</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javax.servlet</groupId>\r
+ <artifactId>servlet-api</artifactId>\r
+ <version>2.5</version>\r
+ </dependency>\r
\r
<!-- ******* SPRING ******* -->\r
<dependency>\r
<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
</dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
- <artifactId>spring-security-core</artifactId>\r
- <version>2.0.4</version>\r
+ <artifactId>spring-security-core</artifactId>\r
+ <version>3.0.0.RELEASE</version>\r
<exclusions>\r
<exclusion>\r
<groupId>org.springframework</groupId>\r
<version>1.8.0.7</version>\r
</dependency>\r
\r
- <dependency>\r
+ <!--for sqlserver2008 and sqlserver2005-->\r
+ <dependency>\r
<groupId>com.microsoft.sqlserver</groupId>\r
- <artifactId>jdbc</artifactId>\r
- <version>1.2</version>\r
- </dependency>\r
+ <artifactId>jdbc4</artifactId>\r
+ <version>2.0</version>\r
+ </dependency>\r
+ \r
<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
<dependency>\r
<groupId>com.microsoft.jdbcdriver</groupId>\r
BGBM BDI Projects / cdmlib.git / blobdiff