ref #9204 move junit and hamcrest (junit dependency) to pom and upgrade to 4.13

diff --git a/.gitignore b/.gitignore
index 07aac1b8325675edbe7e16691f850d726d365df0..529e8ec26ec03a44f764487964cff2765c59a0fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,4 @@ eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-2.*.jar
 eu.etaxonomy.taxeditor.printpublisher/lib/cdmlib-*.jar
 eu.etaxonomy.taxeditor.test/lib/commons-dbcp-1.*.jar
 eu.etaxonomy.taxeditor.test/lib/commons-pool-1.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.*.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index c580bfb6b10c6f497890c33831b6d136095806a8..46cf23665029d6ee42e484af0506a81008f5287d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -646,7 +646,7 @@ Bundle-ClassPath: .,
  lib/xsom-20140925.jar,
  lib/opencsv-2.3.jar,
  lib/jdbc4-2.0.jar,
- lib/junit-4.12.jar,
+ lib/junit-4.13.jar,
  lib/jakarta-regexp-1.4.jar,
  lib/jandex-2.0.0.Final.jar,
  lib/javassist-3.27.0-GA.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 657034b1a21b576468408369a0d302dec67c05fc..5ed36cbb7344e1922d82c947060e0bc6b1d6235f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -86,7 +86,7 @@ bin.includes = META-INF/,\
                lib/xsom-20140925.jar,\
                lib/opencsv-2.3.jar,\
                lib/jdbc4-2.0.jar,\
-               lib/junit-4.12.jar,\
+               lib/junit-4.13.jar,\
                lib/jakarta-regexp-1.4.jar,\
                lib/jandex-2.0.0.Final.jar,\
                lib/javassist-3.27.0-GA.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar
deleted file mode 100644 (file)
index 9d5fe16..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar
deleted file mode 100644 (file)
index 3a7fc26..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 3dfaab9ba9dd30bbd44278fc0e90d3acfff7b342..4715074063ac9bfb02893811614885747ec81bb2 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -75,7 +75,8 @@
                 jaxb-api,javax.activation-api,\r
                 c3p0,opencsv,joda-time,usertype.jodatime,usertype.spi,\r
                 apache-log4j-extras,\r
-                h2,mysql-connector-java,postgresql\r
+                h2,mysql-connector-java,postgresql,\r
+                junit,hamcrest\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r
@@ -608,6 +609,22 @@
     </dependency>\r
       \r
     <!-- For Unit Tests Start -->\r
+       <!-- keep junit and its dependency hamcrest here as long as each plugin\r
+            has its own unit tests and they junit is not yet added there in a way\r
+            that it does not appear in production bundles -->\r
+       <dependency>\r
+        <groupId>junit</groupId>\r
+        <artifactId>junit</artifactId>\r
+        <version>4.13</version>\r
+        <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.hamcrest</groupId>\r
+        <artifactId>hamcrest-core</artifactId>\r
+        <version>1.3</version>\r
+        <scope>test</scope>\r
+    </dependency>\r
+       \r
        <!-- still needed? -->\r
 \r
     <dependency>\r