ref #9204 remove some cdmlib-dbs from git and upgrade postgresql version

diff --git a/.gitignore b/.gitignore
index 9c60ef7688166116d7416afe69f197620baf990f..b2fc200c534699a4ce389fc36f6bb5ca1f671516 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.*.jar
 eu.etaxonomy.taxeditor.printpublisher/lib/fop-2.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.2_spec-1.*.Final.jar
+eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar
+eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar
+eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 156080d96a1e5db045aa5b911f5c692f5fd5e25a..83561368cf8dfb1c8656727d72953642ab8520ba 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -636,7 +636,7 @@ Bundle-ClassPath: .,
  lib/poi-4.1.2.jar,
  lib/poi-ooxml-4.1.2.jar,
  lib/poi-ooxml-schemas-4.1.2.jar,
- lib/postgresql-42.2.15.jar,
+ lib/postgresql-42.2.18.jar,
  lib/lucene-core-5.4.1.jar,
  lib/lucene-queryparser-5.4.1.jar,
  lib/lucene-analyzers-3.6.2.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 7891c1afeef8bcf57ed0188244934aa66590b78d..61bb7d4774c1bbf3e338b764d08901a9f1355235 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -82,7 +82,7 @@ bin.includes = META-INF/,\
                lib/poi-4.1.2.jar,\
                lib/poi-ooxml-4.1.2.jar,\
                lib/poi-ooxml-schemas-4.1.2.jar,\
-               lib/postgresql-42.2.15.jar,\
+               lib/postgresql-42.2.18.jar,\
                lib/lucene-core-5.4.1.jar,\
                lib/lucene-queryparser-5.4.1.jar,\
                lib/lucene-analyzers-3.6.2.jar,\

diff --git a/eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
index fcff1a0f562b2866ae4f517d789f2839b2d9d78d..df891b07c5dd273fe56eef26bd8bb031d4ccaf0a 100644 (file)
--- a/eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Bundle-ClassPath: .,
  lib/c3p0-0.9.5.2.jar,
  lib/h2-1.4.190.jar,
  lib/mchange-commons-java-0.2.11.jar,
- lib/postgresql-42.2.15.jar,
+ lib/postgresql-42.2.18.jar,
  lib/mssql-jdbc-8.4.1.jre8.jar,
  lib/jtds-1.3.1.jar,
  lib/mysql-connector-java-8.0.21.jar,

diff --git a/eu.etaxonomy.taxeditor.local/build.properties b/eu.etaxonomy.taxeditor.local/build.properties
index 46a7a8d6eff447d14ab30daf7a143a3e81855509..d63794ef79d3c34ff8ca26ecab788337e29d212c 100644 (file)
--- a/eu.etaxonomy.taxeditor.local/build.properties
+++ b/eu.etaxonomy.taxeditor.local/build.properties
@@ -5,7 +5,7 @@ bin.includes = META-INF/,\
                lib/,\
                lib/h2-1.4.190.jar,\
                lib/mchange-commons-java-0.2.11.jar,\
-               lib/postgresql-42.2.15.jar,\
+               lib/postgresql-42.2.18.jar,\
                lib/mssql-jdbc-8.4.1.jre8.jar,\
                lib/jtds-1.3.1.jar,\
                lib/mysql-connector-java-8.0.21.jar,\

diff --git a/eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar b/eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar
deleted file mode 100755 (executable)
index 51e270c..0000000
Binary files a/eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar b/eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar
deleted file mode 100755 (executable)
index ab06fb0..0000000
Binary files a/eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.local/lib/postgresql-9.4-1206-jdbc4.jar b/eu.etaxonomy.taxeditor.local/lib/postgresql-9.4-1206-jdbc4.jar
deleted file mode 100755 (executable)
index 5bae20e..0000000
Binary files a/eu.etaxonomy.taxeditor.local/lib/postgresql-9.4-1206-jdbc4.jar and /dev/null differ