tests adapted to taxonomic view and validation for ImportConfigurators changed (no...
[cdmlib.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 56c127a118a3895b2f3fde27f77a5282d7f775aa..cade2cfc9203242e283ace960236fe34b6243634 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.0</version>\r
+       <version>2.1</version>\r
 \r
        <name>CDM Library</name>\r
        <description>The CDM Library implementation for EDIT's internet platform for cybertaxonomy</description>\r
                <module>cdmlib-remote</module>\r
                <module>cdmlib-io</module>\r
        </modules>\r
+  \r
+  <properties>\r
+    <spring.version>2.5.6</spring.version>\r
+  </properties>\r
+\r
                \r
        <mailingLists>\r
                <mailingList>\r
                        </roles>\r
                        <url></url>\r
                </developer>\r
+               <developer>\r
+                       <!-- your SVN account id please! -->\r
+                       <id>n.hoffmann</id>\r
+                       <name>\r
+                               Niels Hoffmann\r
+                       </name>\r
+                       <email>n.hoffmann [at] bgbm.org</email>\r
+                       <organization>\r
+                               Botanic 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>ben.clark</id>\r
                        <url>http://people.apache.org/repo/m2-incubating-repository/</url>\r
                </repository>\r
                <!-- Neccessary for hibernate-envers -->\r
-<!--        <repository>\r
-          <id>jboss-repository</id>\r
-          <name>JBoss Repository</name>\r
-          <url>http://repository.jboss.com/maven2</url>\r
-        </repository>-->\r
+        <repository>\r
+          <releases>\r
+                 <enabled>true</enabled>\r
+                 <updatePolicy>always</updatePolicy>\r
+                 <checksumPolicy>warn</checksumPolicy>\r
+               </releases>\r
+               <snapshots>\r
+                 <enabled>false</enabled>\r
+                 <updatePolicy>never</updatePolicy>\r
+                 <checksumPolicy>fail</checksumPolicy>\r
+               </snapshots>\r
+               <id>jboss-repository</id>\r
+               <name>JBoss Repository</name>\r
+               <url>http://repository.jboss.com/maven2</url>\r
+             </repository>\r
        </repositories>\r
 \r
        <!-- **** PLUGINS **** -->\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
+                               <executions>\r
+                                       <execution>\r
+                                               <goals>\r
+                                                       <goal>generate-html</goal>\r
+                                                       <goal>generate-pdf</goal>\r
+                                               </goals>\r
+                                               <phase>pre-site</phase>\r
+                                       </execution>\r
+                               </executions>\r
+                               <dependencies>\r
+                                       <dependency>\r
+                                               <groupId>org.docbook</groupId>\r
+                                               <artifactId>docbook-xml</artifactId>\r
+                                               <version>4.4</version>\r
+                                               <scope>runtime</scope>\r
+                                       </dependency>\r
+                               </dependencies>\r
+                               <configuration>\r
+                                       <includes>ReferenceDocumentation.xml</includes>\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
+                                   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
+                                       <postProcess>\r
+                                               <copy todir="target/site/reference">\r
+                                                       <fileset dir="target/docbkx">\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" />\r
+                                                               <include name="**/*.png" />\r
+                                                               <include name="**/*.gif" />\r
+                                                               <include name="**/*.jpg" />\r
+                                                       </fileset>\r
+                                               </copy>\r
+                                       </postProcess>\r
+                               </configuration>\r
+                       </plugin>\r
+\r
                </plugins>\r
                <!--  -->\r
                <extensions>\r
                        <dependency>\r
               <groupId>javax.xml.bind</groupId>\r
               <artifactId>jaxb-api</artifactId>\r
-              <version>2.0</version>\r
+              <version>2.1.6</version>\r
             </dependency>\r
             <dependency>\r
               <groupId>xml-resolver</groupId>\r
             <dependency>\r
               <groupId>com.sun.xml.bind</groupId>\r
               <artifactId>jaxb-impl</artifactId>\r
-              <version>2.0</version>\r
+              <version>2.1.6</version>\r
             </dependency>\r
             <dependency>\r
               <groupId>com.sun.xml.bind</groupId>\r
               <artifactId>jaxb1-impl</artifactId>\r
-              <version>2.0</version>\r
+              <version>2.1.6</version>\r
             </dependency>\r
             <dependency>\r
               <groupId>com.sun.xml.bind</groupId>\r
               <artifactId>jaxb-xjc</artifactId>\r
-              <version>2.0</version>\r
+              <version>2.1.6</version>\r
             </dependency>\r
 \r
                        <!-- ******* VARIOUS ******* -->\r
                                <artifactId>log4j</artifactId>\r
                                <version>1.2.15</version>\r
                        </dependency>\r
-                  <!-- hibernate 3.4 uses slf4j -->\r
-                       <!--<dependency>\r
+            <!-- hibernate 3.4 uses slf4j -->\r
+                       <dependency>\r
                     <groupId>org.slf4j</groupId>\r
                     <artifactId>slf4j-log4j12</artifactId>\r
                     <version>1.5.2</version>\r
-                  </dependency>-->\r
+            </dependency>\r
                        <dependency>\r
                                <groupId>junit</groupId>\r
                                <artifactId>junit</artifactId>\r
                          <version>1.0</version>\r
                          <scope>test</scope>\r
                        </dependency>\r
+                       <dependency>\r
+                               <groupId>org.easymock</groupId>\r
+                               <artifactId>easymock</artifactId>\r
+                               <version>2.2</version>\r
+                               <scope>test</scope>\r
+                       </dependency>\r
+                       <dependency>\r
+              <groupId>xmlunit</groupId>\r
+              <artifactId>xmlunit</artifactId>\r
+              <version>1.2</version>\r
+              <scope>test</scope>\r
+            </dependency>\r
                        <dependency>\r
                                <groupId>org.aspectj</groupId>\r
                                <artifactId>aspectjrt</artifactId>\r
-                               <version>1.5.4</version>\r
+                               <version>1.6.3</version>\r
                        </dependency>\r
                        <dependency>\r
                        <groupId>org.aspectj</groupId>\r
                        <artifactId>aspectjweaver</artifactId>\r
-                       <version>1.5.4</version>\r
+                       <version>1.6.3</version>\r
                </dependency>\r
                        <dependency>\r
                            <groupId>javax.annotation</groupId>\r
                      <artifactId>commons-collections</artifactId>\r
                      <version>3.2</version>\r
                    </dependency>\r
+        <dependency>\r
+          <groupId>commons-io</groupId>\r
+          <artifactId>commons-io</artifactId>\r
+          <version>1.4</version>\r
+        </dependency>\r
                    <dependency>\r
                      <groupId>net.sf.ezmorph</groupId>\r
                      <artifactId>ezmorph</artifactId>\r
                    <dependency>\r
                      <groupId>net.sf.json-lib</groupId>\r
                      <artifactId>json-lib</artifactId>\r
-                     <version>2.2.1</version>\r
+                     <version>2.2.3</version>\r
                    </dependency>\r
                        <dependency>\r
                                <groupId>org.devlib.schmidt</groupId>\r
                   <groupId>org.hibernate</groupId>\r
                   <artifactId>hibernate</artifactId>\r
                 </exclusion>\r
+                <exclusion>\r
+                  <groupId>hibernate</groupId>\r
+                  <artifactId>hibernate</artifactId>\r
+                </exclusion>\r
              </exclusions>\r
            </dependency>\r
            <dependency>\r
                                 </exclusion>\r
                                </exclusions>\r
                   </dependency>\r
-       \r
+              <dependency>\r
+             <groupId>com.ibm.lsid</groupId>\r
+             <artifactId>lsid-client</artifactId>\r
+             <version>1.1.2</version>\r
+            </dependency>\r
+            <dependency>\r
+              <groupId>com.ibm.lsid</groupId>\r
+              <artifactId>lsid-server</artifactId>\r
+              <version>1.1.2</version>\r
+            </dependency>\r
+            <dependency>\r
+              <groupId>wsdl4j</groupId>\r
+              <artifactId>wsdl4j</artifactId>\r
+              <version>1.6.1</version>\r
+            </dependency>\r
+                       <dependency>\r
+                               <groupId>net.sf.dozer</groupId>\r
+                               <artifactId>dozer</artifactId>\r
+                               <version>4.4</version>\r
+                       </dependency>\r
                        <!-- ******* XML ******* -->\r
                        <dependency>\r
                                <groupId>xml-apis</groupId>\r
                                <version>1.0</version>\r
                        </dependency>\r
                        <dependency>\r
-                               <groupId>xstream</groupId>\r
+                               <groupId>com.thoughtworks.xstream</groupId>\r
                                <artifactId>xstream</artifactId>\r
-                               <version>1.1</version>\r
+                               <version>1.3.1</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>xpp3</groupId>\r
                                <artifactId>xpp3</artifactId>\r
                                <version>1.1.3.3</version>\r
                        </dependency>\r
+                       <dependency>\r
+                               <groupId>stax</groupId>\r
+                               <artifactId>stax</artifactId>\r
+                               <version>1.2.0</version>\r
+                       </dependency>\r
 \r
                        <!-- ******* HIBERNATE / EJB3 ******* -->\r
-                  <dependency>\r
-                               <groupId>javax.persistence</groupId>\r
-                               <artifactId>ejb</artifactId>\r
-                               <version>3</version>\r
-                       </dependency>\r
-                  <!-- required for hibernate 3.4 -->\r
-                       <!--<dependency>\r
+                       <dependency>\r
                                <groupId>javax.persistence</groupId>\r
                                <artifactId>persistence-api</artifactId>\r
                                <version>1.0</version>\r
-                       </dependency>-->\r
+                       </dependency>\r
                        <dependency>\r
                                <groupId>org.hibernate</groupId>\r
                                <artifactId>hibernate-annotations</artifactId>\r
-                               <version>3.3.1.GA</version>\r
+                               <version>3.4.0-SNAPSHOT</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.hibernate</groupId>\r
                                <artifactId>hibernate-commons-annotations</artifactId>\r
-                               <version>3.3.0.ga</version>\r
+                               <version>3.4.0-SNAPSHOT</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.hibernate</groupId>\r
-                               <artifactId>hibernate</artifactId>\r
-                               <version>3.2.6.ga</version>\r
+                               <artifactId>hibernate-core</artifactId>\r
+                               <version>3.4.0-SNAPSHOT</version>\r
                        </dependency>\r
                        <dependency>\r
                          <groupId>org.hibernate</groupId>\r
                          <artifactId>hibernate-search</artifactId>\r
-                         <version>3.0.1.GA</version>\r
+                         <version>3.1.0.GA</version>\r
                        </dependency>\r
-                  <!-- required for envers -->\r
-                       <!--<dependency>\r
-                    <groupId>org.hibernate</groupId>\r
-                    <artifactId>hibernate-entitymanager</artifactId>\r
-                    <version>3.4.0-SNAPSHOT</version>\r
-                  </dependency>\r
-                  <dependency>\r
-                    <groupId>org.hibernate</groupId>\r
-                    <artifactId>hibernate-envers</artifactId>\r
-                    <version>3.4.0-SNAPSHOT</version>\r
-                  </dependency>-->\r
-                  <!--only needed if using javassist, not cglib-->\r
-                  <!--<dependency> \r
-                    <groupId>javassist</groupId>\r
-                    <artifactId>javassist</artifactId>\r
-                    <version>3.4.GA</version>\r
-                  </dependency>\r
-                  <dependency>\r
-                    <groupId>org.hibernate</groupId>\r
-                    <artifactId>hibernate-cglib-repack</artifactId>\r
-                    <version>2.1_3</version>\r
-                  </dependency>-->\r
-                  <!-- only needed if using second level caching -->\r
-                  <!--<dependency>\r
-                    <groupId>org.hibernate</groupId>\r
-                    <artifactId>hibernate-ehcache</artifactId>\r
-                    <version>3.4.0-SNAPSHOT</version>\r
-                  </dependency>-->\r
+                       <dependency>\r
+              <groupId>org.hibernate</groupId>\r
+              <artifactId>hibernate-entitymanager</artifactId>\r
+              <version>3.4.0-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+              <groupId>org.hibernate</groupId>\r
+              <artifactId>hibernate-envers</artifactId>\r
+              <version>3.4.0-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency> \r
+              <groupId>javassist</groupId>\r
+              <artifactId>javassist</artifactId>\r
+              <version>3.4.GA</version>\r
+            </dependency>\r
+            <dependency>\r
+              <groupId>org.hibernate</groupId>\r
+              <artifactId>hibernate-cglib-repack</artifactId>\r
+              <version>2.1_3</version>\r
+            </dependency>\r
+            <dependency>\r
+              <groupId>org.hibernate</groupId>\r
+              <artifactId>hibernate-ehcache</artifactId>\r
+              <version>3.4.0-SNAPSHOT</version>\r
+            </dependency>\r
                        <dependency>\r
                                <groupId>javax.servlet</groupId>\r
                                <artifactId>servlet-api</artifactId>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-core</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-context</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-beans</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-orm</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-jdbc</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-test</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-webmvc</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-web</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework</groupId>\r
                                <artifactId>spring-aop</artifactId>\r
-                               <version>2.5.6</version>\r
+                               <version>${spring.version}</version>\r
                        </dependency>\r
                        <dependency>\r
+              <groupId>org.springframework</groupId>\r
+              <artifactId>spring-agent</artifactId>\r
+              <version>2.5.6</version>\r
+              <scope>provided</scope>\r
+            </dependency>\r
+           <dependency>\r
+              <groupId>org.springframework</groupId>\r
+              <artifactId>spring-aspects</artifactId>\r
+              <version>2.5.6</version>\r
+            </dependency>\r
+                       <dependency>\r
                                <groupId>org.springframework.security</groupId>\r
                                <artifactId>spring-security-core</artifactId>\r
                                <version>2.0.4</version>\r
                        <artifactId>hsqldb</artifactId>\r
                        <version>1.8.0.7</version>\r
                </dependency>\r
+\r
+               <dependency>\r
+                       <groupId>com.microsoft.sqlserver</groupId>\r
+                       <artifactId>jdbc</artifactId>\r
+                       <version>1.2</version>\r
+               </dependency>\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>msbase</artifactId>\r
                        <version>2000.3</version>\r
                </dependency>\r
-               <dependency>\r
-                       <groupId>com.microsoft.sqlserver</groupId>\r
-                       <artifactId>jdbc</artifactId>\r
-                       <version>1.2</version>\r
-               </dependency>\r
+-->\r
         <dependency>\r
                <groupId>oracle</groupId>\r
                <artifactId>ojdbc14</artifactId>\r