<modelVersion>4.0.0</modelVersion>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>cdmlib-parent</artifactId>\r
- <version>2.5</version>\r
+ <version>3.0</version>\r
<name>CDM Library</name>\r
<description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>\r
<url>http://wp5.e-taxonomy.eu/cdmlib/</url>\r
</organization>\r
<developers>\r
<developer>\r
-<!-- your SVN account id please! -->\r
+ <!-- your SVN account id please! -->\r
<id>ben.clark</id>\r
<name>\r
Ben Clark\r
<role>Architect</role>\r
<role>Java Developer</role>\r
</roles>\r
- <url></url>\r
+ <url/>\r
</developer>\r
<developer>\r
-<!-- your SVN account id please! -->\r
+ <!-- your SVN account id please! -->\r
<id>n.hoffmann</id>\r
<name>\r
Niels Hoffmann\r
<roles>\r
<role>Java Developer</role>\r
</roles>\r
- <url></url>\r
+ <url/>\r
</developer>\r
<developer>\r
-<!-- your SVN account id please! -->\r
+ <!-- your SVN account id please! -->\r
<id>a.kohlbecker</id>\r
<name>\r
Andreas Kohlbecker\r
<roles>\r
<role>Java Developer</role>\r
</roles>\r
- <url></url>\r
+ <url/>\r
</developer>\r
<developer>\r
-<!-- your SVN account id please! -->\r
+ <!-- your SVN account id please! -->\r
<id>k.luther</id>\r
<name>\r
Katja Luther\r
<roles>\r
<role>Java Developer</role>\r
</roles>\r
- <url></url>\r
+ <url/>\r
</developer>\r
<developer>\r
-<!-- your SVN account id please! -->\r
+ <!-- your SVN account id please! -->\r
<id>a.mueller</id>\r
<name>\r
Andreas Müller\r
<role>Java Developer</role>\r
<role>Release Manager</role>\r
</roles>\r
- <url></url>\r
+ <url/>\r
</developer>\r
<developer>\r
-<!-- your SVN account id please! -->\r
+ <!-- your SVN account id please! -->\r
<id>f.revilla</id>\r
<name>\r
Francisco Revilla \r
<roles>\r
<role>Java Developer</role>\r
</roles>\r
- <url></url>\r
+ <url/>\r
</developer>\r
</developers>\r
-<!--contributors>\r
+ <!--contributors>\r
<contributor>\r
<name>Test-Contributor</name>\r
</contributor>\r
<url>http://dev.e-taxonomy.eu/trac/</url>\r
</issueManagement>\r
<ciManagement>\r
- <system>Hudson</system>\r
- <url>http://160.45.63.201/hudson</url>\r
+ <system>Hudson</system>\r
+ <url>http://160.45.63.201/hudson</url>\r
</ciManagement>\r
-<!-- **** REPOSITORIES **** -->\r
+ <!-- **** REPOSITORIES **** -->\r
<repositories>\r
-<!-- sun repository -->\r
+ <!-- sun repository -->\r
<repository>\r
<id>java.net</id>\r
<url>http://download.java.net/maven/1/</url>\r
</repository>\r
-<!-- the cdm internal repository -->\r
+ <!-- the cdm internal repository -->\r
<repository>\r
<id>EditRepository</id>\r
<url>http://wp5.e-taxonomy.eu/cdmlib/mavenrepo/</url>\r
</repository>\r
-<!-- apache incubating repository -->\r
+ <!-- apache incubating repository -->\r
<repository>\r
<id>ApacheIncubating</id>\r
<url>http://people.apache.org/repo/m2-incubating-repository/</url>\r
</repository>\r
-<!-- Neccessary for hibernate-envers -->\r
+ <!-- Neccessary for hibernate-envers -->\r
<repository>\r
<releases>\r
<enabled>true</enabled>\r
<name>JBoss Repository</name>\r
<url>http://repository.jboss.com/maven2</url>\r
</repository>\r
-<!-- codehaus mule repository needed for yourkit -->\r
+ <!-- codehaus mule repository needed for yourkit -->\r
<repository>\r
<id>CodehausMuleRepository</id>\r
<url>http://dist.codehaus.org/mule/dependencies/maven2/</url>\r
</repository>\r
-<!-- current spring source repositories -->\r
+ <!-- current spring source repositories -->\r
<repository>\r
<id>SpringSource Enterprise Bundle Repository - External Bundle Milestones</id>\r
<url>http://repository.springsource.com/maven/bundles/milestone</url>\r
<url>http://repository.springsource.com/maven/bundles/external</url>\r
</repository>\r
</repositories>\r
-<!-- **** PLUGINS **** -->\r
+ <!-- **** PLUGINS **** -->\r
<build>\r
<plugins>\r
<plugin>\r
<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
</executions>\r
<configuration>\r
<doCheck>false</doCheck>\r
-<!-- Only create the build number if there are no local modifications -->\r
+ <!-- Only create the build number if there are no local modifications -->\r
<doUpdate>false</doUpdate>\r
-<!-- automatically update the local svn copy -->\r
+ <!-- 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
- Falling back to maven-site-plugin 2.0-beta-5 since\r
- maven-site-plugin 2.0-beta-6 has this problem:\r
- Embedded error: Unrecognised tag: 'site' (position: START_TAG seen <?xml\r
- version="1.0" encoding="ISO-8859-1"?>\r\n<site>... @2:7) -->\r
<version>2.1.1</version>\r
<configuration>\r
<locales>en</locales>\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-source-plugin</artifactId>\r
+ <version>2.1.2</version>\r
<executions>\r
<execution>\r
<id>attach-sources</id>\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-javadoc-plugin</artifactId>\r
+ <version>2.7</version>\r
<configuration>\r
- <aggregate>true</aggregate>\r
<stylesheet>maven</stylesheet>\r
+ <quiet>true</quiet>\r
+ <detectLinks>true</detectLinks>\r
+ <failOnError>false</failOnError>\r
</configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>aggregate</id>\r
+ <goals>\r
+ <goal>aggregate</goal>\r
+ </goals>\r
+ <phase>site</phase>\r
+ </execution>\r
+ </executions>\r
</plugin>\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-eclipse-plugin</artifactId>\r
+ <version>2.8</version>\r
<configuration>\r
<downloadSources>true</downloadSources>\r
<downloadJavadocs>true</downloadJavadocs>\r
<chunkedOutput>true</chunkedOutput>\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
+ <!--<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
<value>${pom.version}</value>\r
</entity>\r
</entities>\r
-<!--We want the final documentation and the required resources to end up in \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
- <include name="**/*.html"></include>\r
- <include name="**/*.pdf"></include>\r
+ <include name="**/*.html"/>\r
+ <include name="**/*.pdf"/>\r
</fileset>\r
</copy>\r
<copy todir="target/site/reference/html">\r
<fileset dir="src/docbkx">\r
- <include name="**/*.css"></include>\r
- <include name="**/*.png"></include>\r
- <include name="**/*.gif"></include>\r
- <include name="**/*.jpg"></include>\r
+ <include name="**/*.css"/>\r
+ <include name="**/*.png"/>\r
+ <include name="**/*.gif"/>\r
+ <include name="**/*.jpg"/>\r
</fileset>\r
</copy>\r
</postProcess>\r
</configuration>\r
</plugin>\r
+ <plugin>\r
+ <groupId>org.codehaus.mojo</groupId>\r
+ <artifactId>wagon-maven-plugin</artifactId>\r
+ <version>1.0-beta-3</version>\r
+ <configuration>\r
+ <fromDir>${project.build.directory}/docbkx/</fromDir>\r
+ <includes>**/*</includes>\r
+ <excludes/>\r
+ <url>scpexe://160.45.63.151</url>\r
+ <serverId>wp5.e-taxonomy.eu</serverId>\r
+ <toDir>var/www/wp5.e-taxonomy.eu/cdmlib/reference/${pom.version}</toDir>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>upload-reference-documentation</id>\r
+ <phase>site-deploy</phase>\r
+ <goals>\r
+ <goal>upload</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
</plugins>\r
-<!-- -->\r
+ <!-- -->\r
<extensions>\r
<extension>\r
<groupId>org.apache.maven.wagon</groupId>\r
<artifactId>wagon-scm</artifactId>\r
- <version>1.0-alpha-5</version>\r
+ <version>1.0-beta-6</version>\r
</extension>\r
-<!--\r
- <extension>\r
+ <extension>\r
+ <groupId>org.apache.maven.wagon</groupId>\r
+ <artifactId>wagon-ssh</artifactId>\r
+ <version>1.0-beta-6</version>\r
+ </extension>\r
+ <extension>\r
<groupId>org.apache.maven.wagon</groupId>\r
<artifactId>wagon-ssh-external</artifactId>\r
- <version>1.0-alpha-5</version>\r
- </extension>\r
- -->\r
+ <version>1.0-beta-6</version>\r
+ </extension>\r
<extension>\r
<groupId>org.apache.maven.scm</groupId>\r
<artifactId>maven-scm-manager-plexus</artifactId>\r
<artifactId>maven-scm-provider-svnexe</artifactId>\r
<version>1.0</version>\r
</extension>\r
-<!-- WebDAV plugin to upload snapshots -->\r
+ <!-- WebDAV plugin to upload snapshots -->\r
<extension>\r
<groupId>org.apache.maven.wagon</groupId>\r
<artifactId>wagon-webdav</artifactId>\r
<reporting>\r
<plugins>\r
<plugin>\r
-<!-- you will want to start by publishing your classes' Javadocs -->\r
+ <!-- you will want to start by publishing your classes' Javadocs -->\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-javadoc-plugin</artifactId>\r
+ <version>2.7</version>\r
<configuration>\r
- <links>\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
- </links>\r
+ <detectLinks>true</detectLinks>\r
</configuration>\r
</plugin>\r
<plugin>\r
-<!-- this will generate an indexed and cross-referenced HTML version of your source code -->\r
+ <!-- this will generate an indexed and cross-referenced HTML version of your source code -->\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-jxr-plugin</artifactId>\r
+ <version>2.2</version>\r
</plugin>\r
<plugin>\r
-<!-- if you use @todo tags to remind you of things to be done (which is a good coding practice), the taglist report will generate a list of all the items marked @todo or TODO -->\r
+ <!-- if you use @todo tags to remind you of things to be done (which is a good coding practice), the taglist report will generate a list of all the items marked @todo or TODO -->\r
<groupId>org.codehaus.mojo</groupId>\r
<artifactId>taglist-maven-plugin</artifactId>\r
+ <version>2.4</version>\r
</plugin>\r
<plugin>\r
-<!-- Test coverage can be a useful indication of the quality of your unit tests. It basically tells you how much of your code is actually run by your unit tests, which, in turn, can give you a good idea of the tests' quality -->\r
+ <!-- Test coverage can be a useful indication of the quality of your unit tests. It basically tells you how much of your code is actually run by your unit tests, which, in turn, can give you a good idea of the tests' quality -->\r
<groupId>org.codehaus.mojo</groupId>\r
<artifactId>cobertura-maven-plugin</artifactId>\r
-<!--\r
+ <version>2.4</version>\r
+ <!--\r
<executions>\r
<execution>\r
<id>clean</id>\r
</executions>\r
-->\r
</plugin>\r
-<!-- \r
+ <!-- \r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-project-info-reports-plugin</artifactId>\r
</reportSet>\r
</reportSets>\r
</plugin> -->\r
-<!-- The changes-maven-plugin plug-in uses a special XML file (src/changes/changes.xml) to track releases and changes in each release -->\r
-<!-- \r
+ <!-- The changes-maven-plugin plug-in uses a special XML file (src/changes/changes.xml) to track releases and changes in each release -->\r
<plugin>\r
- <groupId>org.codehaus.mojo</groupId>\r
- <artifactId>changes-maven-plugin</artifactId>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-changes-plugin</artifactId>\r
+ <version>2.3</version>\r
+ <configuration>\r
+ <issueLinkTemplatePerSystem>\r
+ <default>%URL%/ticket/%ISSUE%</default>\r
+ </issueLinkTemplatePerSystem>\r
+ </configuration>\r
+ <reportSets>\r
+ <reportSet>\r
+ <reports>\r
+ <report>changes-report</report>\r
+ </reports>\r
+ </reportSet>\r
+ </reportSets>\r
</plugin>\r
+ <!--\r
<plugin>\r
<artifactId>maven-surefire-plugin</artifactId>\r
</plugin>\r
-->\r
-<!-- The changelog plug-in generates a nice report describing which files have been changed and by whom -->\r
-<!-- \r
+ <!-- The changelog plug-in generates a nice report describing which files have been changed and by whom -->\r
+ <!-- \r
<plugin>\r
<groupId>org.codehaus.mojo</groupId>\r
<artifactId>changelog-maven-plugin</artifactId>\r
-->\r
</plugins>\r
</reporting>\r
-<!-- DISTRIBUTION MANAGEMENT -->\r
+ <!-- DISTRIBUTION MANAGEMENT -->\r
<distributionManagement>\r
<site>\r
<id>wp5.e-taxonomy.eu</id>\r
<layout>default</layout>\r
</repository>\r
</distributionManagement>\r
-<!-- **** DEPENDENCIES **** -->\r
+ <!-- **** DEPENDENCIES **** -->\r
<dependencies>\r
<dependency>\r
<groupId>org.unitils</groupId>\r
<artifactId>cdmlib-print</artifactId>\r
<version>${project.version}</version>\r
</dependency>\r
-<!--*********** JAXB********* -->\r
+ <!--*********** JAXB********* -->\r
<dependency>\r
<groupId>javax.xml.bind</groupId>\r
<artifactId>jaxb-api</artifactId>\r
<artifactId>jaxb-xjc</artifactId>\r
<version>2.1.6</version>\r
</dependency>\r
-<!-- ******* VARIOUS ******* -->\r
+ <!-- ******* VARIOUS ******* -->\r
<dependency>\r
<groupId>log4j</groupId>\r
<artifactId>log4j</artifactId>\r
<version>1.2.15</version>\r
</dependency>\r
-<!-- hibernate 3.4 uses slf4j -->\r
+ <!-- hibernate 3.4 uses slf4j -->\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
<artifactId>slf4j-api</artifactId>\r
<dependency>\r
<groupId>org.eclipse</groupId>\r
<artifactId>osgi</artifactId>\r
- <version>3.2.1-R32x_v20060919</version>\r
+ <version>3.6.0</version>\r
</dependency>\r
<dependency>\r
<groupId>cglib</groupId>\r
<artifactId>sanselan</artifactId>\r
<version>0.97-incubator</version>\r
</dependency>\r
-<!-- joda-time -->\r
+ <!-- joda-time -->\r
<dependency>\r
<groupId>joda-time</groupId>\r
<artifactId>joda-time</artifactId>\r
<artifactId>dozer</artifactId>\r
<version>5.3.0</version>\r
</dependency>\r
-<!-- ******* XML ******* -->\r
+ <!-- ******* XML ******* -->\r
<dependency>\r
<groupId>xml-apis</groupId>\r
<artifactId>xml-apis</artifactId>\r
<artifactId>stax</artifactId>\r
<version>1.2.0</version>\r
</dependency>\r
-<!-- ******* HIBERNATE / EJB3 ******* -->\r
+ <!-- ******* HIBERNATE / EJB3 ******* -->\r
<dependency>\r
<groupId>javax.persistence</groupId>\r
<artifactId>persistence-api</artifactId>\r
<artifactId>servlet-api</artifactId>\r
<version>2.5</version>\r
</dependency>\r
-<!-- ******* SPRING ******* -->\r
+ <!-- ******* SPRING ******* -->\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<artifactId>org.springframework.core</artifactId>\r
</exclusion>\r
</exclusions>\r
</dependency>\r
-<!-- ******* SERVLET/JSP/JSF ******* -->\r
+ <!-- ******* SERVLET/JSP/JSF ******* -->\r
<dependency>\r
<groupId>javax.servlet</groupId>\r
<artifactId>servlet-api</artifactId>\r
<version>2.5</version>\r
</dependency>\r
-<!-- ******* DATABASES DRIVER ******* -->\r
+ <!-- ******* DATABASES DRIVER ******* -->\r
<dependency>\r
-<!-- SQL Server and Sybase -->\r
+ <!-- SQL Server and Sybase -->\r
<groupId>net.sourceforge.jtds</groupId>\r
<artifactId>jtds</artifactId>\r
<version>1.2.2</version>\r
<artifactId>hsqldb</artifactId>\r
<version>1.8.0.7</version>\r
</dependency>\r
-<!--for sqlserver2008 and sqlserver2005-->\r
+ <!--for sqlserver2008 and sqlserver2005-->\r
<dependency>\r
<groupId>com.microsoft.sqlserver</groupId>\r
<artifactId>jdbc4</artifactId>\r
<version>2.0</version>\r
</dependency>\r
-<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
+ <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
<dependency>\r
<groupId>com.microsoft.jdbcdriver</groupId>\r
<artifactId>mssqlserver</artifactId>\r
<artifactId>h2</artifactId>\r
<version>1.1.115</version>\r
</dependency>\r
-<!-- yourkit profiler api controller (used in ..)-->\r
+ <!-- yourkit profiler api controller (used in ..)-->\r
<dependency>\r
<groupId>com.yourkit</groupId>\r
<artifactId>yjp-controller-api-redist</artifactId>\r
<version>8.0.1</version>\r
</dependency>\r
-<!-- For Validation -->\r
+ <!-- For Validation -->\r
<dependency>\r
<groupId>javax.validation</groupId>\r
<artifactId>validation-api</artifactId>\r
BGBM BDI Projects / cdmlib.git / blobdiff