DRYD-237: Updating to newer JDBC driver.

diff --git a/3rdparty/jdbc_drivers/postgresql-42.2.1.jar b/3rdparty/jdbc_drivers/postgresql-42.2.1.jar
new file mode 100644 (file)
index 0000000..e934846
Binary files /dev/null and b/3rdparty/jdbc_drivers/postgresql-42.2.1.jar differ

diff --git a/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar 2.zip b/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar 2.zip
new file mode 100644 (file)
index 0000000..e934846
Binary files /dev/null and b/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar 2.zip differ

diff --git a/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar.cpgz b/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar.cpgz
new file mode 100644 (file)
index 0000000..8d5b28e
Binary files /dev/null and b/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar.cpgz differ

diff --git a/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar.zip b/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar.zip
new file mode 100644 (file)
index 0000000..e934846
Binary files /dev/null and b/3rdparty/jdbc_drivers/temp/postgresql-42.2.1.jar.zip differ

diff --git a/build.properties b/build.properties
index 3ffe2fa12d741d811fcd0bb7c4033f7f7e74cf25..2c6277612a97a1053f3caa90de303426c21e590d 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-host=127.0.0.1
+42.2.1host=127.0.0.1
 #cspace
 # Instance IDs help identify the databases and database users that belong to
 # a particular CollectionSpace server instance, in a configuration where
@@ -114,7 +114,7 @@ db=postgresql
 # db.xaDataSource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
 
 #For postgresql, uncomment this, and comment out mysql section
-db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-9.4.1212.jar
+db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-42.2.1.jar
 db.jdbc.driver.class=org.postgresql.Driver
 db.dialect=org.hibernate.dialect.PostgreSQLDialect
 db.typemapping=PostgreSQL 8.0

diff --git a/services/JaxRsServiceProvider/src/main/resources/log4j.properties b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
index 0dbb72869bc24c6e207f985eebae9dcc0dba6449..3f959c1d766dcb1d64eb04fdb803e41b9ed989d7 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/resources/log4j.properties
+++ b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
@@ -53,6 +53,7 @@ log4j.additivity.perf.collectionspace=false
 # CollectionSpace loggers and default levels - all loggers using the rootLogger if not otherwise specified
 #
 log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.collectionspace.services.common.query.nuxeo.QueryManagerNuxeoImpl=TRACE
 log4j.logger.org.collectionspace.services.authorization.spring.SpringPermissionManager=ERROR
 log4j.logger.org.collectionspace.services.listener.AbstractUpdateObjectLocationValues=INFO
 log4j.logger.org.collectionspace.services.common.context.AbstractServiceContextImpl=ERROR

diff --git a/services/pom.xml b/services/pom.xml
index 9f24cb8641d4ccf8cff60b8250e68250d57fd7c1..777b7421d0208a7a8df3cdfb17d8d80462c42c78 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -18,7 +18,7 @@
                <jaxb.version>2.2.11</jaxb.version>
                <resteasy.version>3.0.19.Final</resteasy.version>
                <mysql.driver.version>5.1.8</mysql.driver.version>
-               <postgres.driver.version>9.4.1212</postgres.driver.version>
+               <postgres.driver.version>42.2.1</postgres.driver.version>
                <!-- The default life cycle policy for Nuxeo document types -->
                <Lifecycle>cs_default</Lifecycle>
        </properties>