update Xerces to 2.11.0 and fix some other dependencies / and remove commented depend...

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
index 8eb4494a8ab0261cc046d8c590217504c226a95f..df7ad89bf218951026d489cfcf6436afe6b7a32c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
@@ -283,7 +283,7 @@ public class SDDDocumentBuilder {
                Iterator<Reference> iterator = references.iterator();\r
                IDatabase d = ReferenceFactory.newDatabase();\r
                while (iterator.hasNext()) {\r
-                       Reference reference = iterator.next();\r
+                       Reference<?> reference = iterator.next();\r
                        if (reference.getType().equals(ReferenceType.Database)) {\r
                                buildDataset(baselement, reference);\r
                        }\r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/in/DatabaseMappingTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/in/DatabaseMappingTest.java
index 089e3cb52f1ae0ed840c8d90b6fc40c3ce7b1e1a..7d9c51a5c1fe6972ec9041e13e83845cb042cfee 100644 (file)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/in/DatabaseMappingTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/in/DatabaseMappingTest.java
@@ -17,7 +17,6 @@ import org.apache.log4j.Logger;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.BeforeClass;\r
-import org.junit.Ignore;\r
 import org.junit.Test;\r
 \r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index e68241a69e518ad15a44e7275fcbd09a66c93031..b92912207960f475fd465d28bbf4283c68d1617f 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -169,12 +169,12 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-c3p0</artifactId>
     </dependency>
-        <!-- only needed as long as hibernate-c3p0 is still dependend on c3p0/c3p0/0.9.1 -->
-        <dependency>
-                               <groupId>com.mchange</groupId>
-                               <artifactId>c3p0</artifactId>
-                               <version>0.9.2</version>
-                       </dependency>
+        <!-- only needed as long as hibernate-c3p0 is still dependend on c3p0/c3p0/0.9.1 -->
+        <dependency>
+                       <groupId>com.mchange</groupId>
+                       <artifactId>c3p0</artifactId>
+                       <version>0.9.2</version>
+               </dependency>
     
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -291,10 +291,12 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
     </dependency>
-<!--     <dependency>
-     <groupId>org.springmodules</groupId>
-     <artifactId>spring-modules-lucene</artifactId>
-    </dependency> -->
+         <!-- required by Xerces 2.11.0 -->
+         <dependency>
+               <groupId>org.apache.xmlgraphics</groupId>
+               <artifactId>batik-ext</artifactId>
+         </dependency>
+
     <!-- ******* DATABASES DRIVER ******* -->
     <dependency>
       <groupId>mysql</groupId>
@@ -313,28 +315,11 @@
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
     </dependency>
-    <!--<dependency>
-      <groupId>com.microsoft.sqlserver</groupId>
-      <artifactId>jdbc4</artifactId>
-    </dependency>-->
-  <dependency>
+    <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>jdbc4</artifactId>
     </dependency>
-<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
-    <dependency>
-      <groupId>com.microsoft.jdbcdriver</groupId>
-      <artifactId>mssqlserver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.jdbcdriver</groupId>
-      <artifactId>msutil</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.jdbcdriver</groupId>
-      <artifactId>msbase</artifactId>
-    </dependency>
--->
+
     <dependency>
     <groupId>com.h2database</groupId>
     <artifactId>h2</artifactId>

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
index 3f832380f91169541a02ee523900037455ed9713..04f652087de94cb9f3ff18e87e20c63b45995d4c 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
@@ -697,7 +697,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                        if (xmlBean == null){\r
                                //TODO warn or info\r
                                logger.debug("Unknown Element 'bean id=" +strDataSourceName + "' ");\r
-                       };\r
+                       }\r
                        return xmlBean;\r
                }\r
        }\r

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 95ff582322ee7c1e961cfca50669dc560dde33ef..63cb5b9e6dfb653c536cb92f06fcd62d7e071dfd 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -69,72 +69,21 @@
        <groupId>org.apache.lucene</groupId>
        <artifactId>lucene-grouping</artifactId>
     </dependency>
-<!--     <dependency> -->
-<!--         <groupId>org.unitils</groupId> -->
-<!--         <artifactId>unitils-core</artifactId> -->
-<!--         <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-database</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-dbmaintainer</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
     <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-dbunit</artifactId>
       <scope>test</scope>
     </dependency>
-<!--      <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-easymock</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-mock</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-inject</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--      <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-orm</artifactId> -->
-<!--       <exclusions> -->
-<!--           <exclusion> -->
-<!--                   <groupId>javax.persistence</groupId> -->
-<!--           <artifactId>persistence-api</artifactId> -->
-<!--           </exclusion> -->
-<!--       </exclusions> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-     <dependency>
+    <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-spring</artifactId>
       <scope>test</scope>
     </dependency>
-<!--     <dependency> -->
-<!--       <groupId>org.dbunit</groupId> -->
-<!--       <artifactId>dbunit</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
        <scope>test</scope>
     </dependency>
-<!--     <dependency> -->
-<!--       <groupId>com.carrotsearch</groupId> -->
-<!--       <artifactId>junit-benchmarks</artifactId> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>org.springframework.test</artifactId>
@@ -158,7 +107,6 @@
     <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-config</artifactId>
-    <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.lsid</groupId>