ref #9204 remove dbunit from taxeditor.cdmlib and upgrade to 2.7.0 in taxeditor.test

diff --git a/.gitattributes b/.gitattributes
index 745d9750a20648d3957d7e6b3de484354a928eef..2be6a10876b3f019f4afcc93644c95683a1d865e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -170,7 +170,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/dbunit-2.4.9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dom4j-1.6.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text

diff --git a/.gitignore b/.gitignore
index 22190e1df9d48df29892eec71770f061ba85db1e..42b960f111a913e96e83d050ae7247467ad162a5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@ eu.etaxonomy.taxeditor.test/lib/unitils-dbunit-3*.jar
 eu.etaxonomy.taxeditor.test/lib/unitils-spring-3*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6.jar
 eu.etaxonomy.taxeditor.test/lib/c3p0-0.9.5.2.jar
+eu.etaxonomy.taxeditor.test/lib/dbunit-2.7.0.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 96b15ed9ae4296edecbc849eee2fc74476eaf541..0a3cfef980464058306e70fae196273dd25abde0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -632,7 +632,6 @@ Bundle-ClassPath: .,
  lib/commons-lang-2.6.jar,
  lib/commons-logging-1.2.jar,
  lib/commons-pool-1.5.4.jar,
- lib/dbunit-2.4.9.jar,
  lib/dom4j-1.6.1.jar,
  lib/dtd-parser-1.1.jar,
  lib/ehcache-core-2.6.11.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index bd49d5d9fad01fbbc38ea4b08671f206d111f031..f2bd7825d15288aed02af64ef54ff2ea16dc47ea 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -26,7 +26,6 @@ bin.includes = META-INF/,\
                lib/commons-lang3-3.11.jar,\
                lib/commons-logging-1.2.jar,\
                lib/commons-pool-1.5.4.jar,\
-               lib/dbunit-2.4.9.jar,\
                lib/dom4j-1.6.1.jar,\
                lib/dtd-parser-1.1.jar,\
                lib/ehcache-core-2.6.11.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/dbunit-2.4.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/dbunit-2.4.9.jar
deleted file mode 100644 (file)
index 130921b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/dbunit-2.4.9.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 022c26f7a6ce67614beb3636bb48e9610a399b2c..95861dd8ff89caefd3619147827f18acb81a092c 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -29,6 +29,6 @@ Bundle-ClassPath: .,
  lib/unitils-dbmaintainer-3.4.2.jar,
  lib/unitils-dbunit-3.4.2.jar,
  lib/unitils-spring-3.4.2.jar,
- lib/dbunit-2.4.9.jar,
+ lib/dbunit-2.7.0.jar,
  lib/h2-1.4.200.jar,
  lib/c3p0-0.9.5.2.jar
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.test/build.properties b/eu.etaxonomy.taxeditor.test/build.properties
index 35092e8dbaeb657aeb1fca62a00a3746ddef3458..6c3b891e790bddfcd518efc037be78356028ad4d 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/build.properties
+++ b/eu.etaxonomy.taxeditor.test/build.properties
@@ -8,7 +8,7 @@ bin.includes = META-INF/,\
                lib/unitils-dbmaintainer-3.4.6.jar,\
                lib/unitils-dbunit-3.4.6.jar,\
                lib/unitils-spring-3.4.6.jar,\
-               lib/dbunit-2.4.9.jar,\
+               lib/dbunit-2.7.0.jar,\
                lib/h2-1.4.200.jar,\
                lib/c3p0-0.9.5.2.jar,\
                src/test/resources/

diff --git a/eu.etaxonomy.taxeditor.test/lib/dbunit-2.4.9.jar b/eu.etaxonomy.taxeditor.test/lib/dbunit-2.4.9.jar
deleted file mode 100644 (file)
index 130921b..0000000
Binary files a/eu.etaxonomy.taxeditor.test/lib/dbunit-2.4.9.jar and /dev/null differ