ref #9204 reattache c3p0 to taxeditor main and revert unitils version to 3.4.2

diff --git a/.gitignore b/.gitignore
index 94d23ddc01d305d00cbb8baa9b5c19c5854925e3..22190e1df9d48df29892eec71770f061ba85db1e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -83,9 +83,10 @@ eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-8.0.21.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-42.2.15.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.4.01.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/lsid-client-1.1.2.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-core-3.4.6.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-database-3.4.6.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-dbmaintainer-3.4.6.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-dbunit-3.4.6.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-spring-3.4.6.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-core-3*.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-database-3*.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-dbmaintainer-3*.jar
+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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 093cd69016dc0c07a9f24341a95aadaef7261884..96b15ed9ae4296edecbc849eee2fc74476eaf541 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -788,10 +788,10 @@ Bundle-ClassPath: .,
  lib/httpcore-4.4.13.jar,
  lib/httpmime-4.5.12.jar,
  lib/JavaAPIforKml-2.2.1.jar,
+ lib/c3p0-0.9.5.2.jar,
  lib/iiif-apis-0.3.7.jar
 Comment: currently excluded - lib/jta-1.1.jar,
  lib/hibernate-c3p0-5.0.7.Final.jar,
- lib/c3p0-0.9.5.2.jar,
  lib/jaxen-1.2.0.jar,
  lib/lsid-server-1.1.2.jar,
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index fa261838b68ecd67682e24b929096bc61224f5dc..bd49d5d9fad01fbbc38ea4b08671f206d111f031 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -183,9 +183,10 @@ bin.includes = META-INF/,\
                lib/docx4j-6.0.1.jar,\
                lib/mysql-connector-java-8.0.21.jar,\
                lib/JavaAPIforKml-2.2.1.jar,\
-               lib/iiif-apis-0.3.7.jar
+               lib/iiif-apis-0.3.7.jar,\
+               lib/c3p0-0.9.5.2.jar
 
-#  currently excluded  lib/jta-1.1.jar,lib/hibernate-c3p0-5.0.7.Final.jar,lib/c3p0-0.9.5.2.jar,lib/jaxen-1.2.0.jar,lib/lsid-server-1.1.2.jar,\
+#  currently excluded  lib/jta-1.1.jar,lib/hibernate-c3p0-5.0.7.Final.jar,lib/jaxen-1.2.0.jar,lib/lsid-server-1.1.2.jar,\
 #  currently excluded        
 
 jars.compile.order = .

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar
deleted file mode 100644 (file)
index 579cedd..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 05666b258361b238993520282dbbe3174611de63..aef8cd643673d6b5cb3ce6f2d10d441f5d06fb0f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -67,7 +67,7 @@
                 aopalliance,aspectjweaver,aspectjrt,\r
                 hibernate-jpa-2.1-api,javassist,hibernate-commons-annotations,\r
                 xml-apis,lsid-client,\r
-                \r
+                c3p0,\r
                 h2,mysql-connector-java,postgresql\r
               </includeArtifactIds>\r
               <outputDirectory>\r
@@ -389,6 +389,13 @@
         <artifactId>commons-lang</artifactId>\r
         <version>2.6</version>\r
     </dependency>\r
+    <dependency>\r
+        <!-- maybe only needed for tests, but does not work to only have there -->\r
+        <groupId>com.mchange</groupId>\r
+        <artifactId>c3p0</artifactId>\r
+        <version>0.9.5.2</version>\r
+<!--         <scope>test</scope> -->\r
+    </dependency>\r
     \r
     <!-- jackson, not sure if really needed -->\r
     <dependency>\r

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 4c34aaadafce9f84d2235a3a580e79a4c7674596..022c26f7a6ce67614beb3636bb48e9610a399b2c 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -24,11 +24,11 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-RegisterBuddy: org.apache.log4j, org.eclipse.swtbot.swt.finder
 Bundle-ClassPath: .,
  lib/byte-buddy-0.5.1.jar,
- lib/unitils-core-3.4.6.jar,
- lib/unitils-database-3.4.6.jar,
- lib/unitils-dbmaintainer-3.4.6.jar,
- lib/unitils-dbunit-3.4.6.jar,
- lib/unitils-spring-3.4.6.jar,
+ lib/unitils-core-3.4.2.jar,
+ lib/unitils-database-3.4.2.jar,
+ 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/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/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 2a3a5bbb206688aca42b56f8c63010c5d6a11cae..a2cea9bc571f1c271fe1c8801f821b5a359f3787 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -10,6 +10,9 @@
        see https://wiki.eclipse.org/Tycho/Packaging_Types#eclipse-test-plugin -->
   <packaging>eclipse-test-plugin</packaging>
   <name>UI Test Bundle</name>
+  <properties>
+               <unitils.version>3.4.2</unitils.version>
+  </properties>
   <description>Holds all Tests for the Taxonomic Editor</description>
   <build>
    <resources>

diff --git a/pom.xml b/pom.xml
index 0747f4c4582caaae476d92b6d0254fee3c125c46..c9a86ca30f56e6f0fcdf800f220b44cfae7499b1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
     <tycho.version>1.0.0</tycho.version>
     <taxeditor.version>5.18.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
-    <unitils.version>3.4.6</unitils.version>
     <log4j.version>1.2.17</log4j.version>
     <javadoc.opts>-Xdoclint:none</javadoc.opts>
     <httpcomponents.version>4.5.12</httpcomponents.version>