Merge pull request #6618 from OdumInstitute/5784_update_jdbc_driver

#5784 update jdbc driver
IQSS · Feb 7, 2020 · 9ce4aa0 · 9ce4aa0
2 parents 9790a57 + 4c3470b
commit 9ce4aa0
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/conf/docker-aio/testscripts/install b/conf/docker-aio/testscripts/install
@@ -15,7 +15,7 @@ export SMTP_SERVER=localhost
 export MEM_HEAP_SIZE=2048
 export GLASSFISH_DOMAIN=domain1
 cd scripts/installer
-cp pgdriver/postgresql-42.2.2.jar $GLASSFISH_ROOT/glassfish/lib
+cp pgdriver/postgresql-42.2.9.jar $GLASSFISH_ROOT/glassfish/lib
 #cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
 cp /opt/dv/testdata/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
 cp /opt/dv/testdata/jhoveConfig.xsd $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhoveConfig.xsd

diff --git a/conf/docker/dataverse-glassfish/Dockerfile b/conf/docker/dataverse-glassfish/Dockerfile
@@ -70,7 +70,7 @@ RUN /tmp/dvinstall/glassfish-setup.sh
 ###glassfish-setup will handle everything in Dockerbuild
 
 ##install jdbc driver 
-RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.2.jar /usr/local/glassfish4/glassfish/domains/domain1/lib
+RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.9.jar /usr/local/glassfish4/glassfish/domains/domain1/lib
 
 # Customized persistence xml to avoid database recreation
 #RUN mkdir -p /tmp/WEB-INF/classes/META-INF/ 

diff --git a/scripts/deploy/phoenix.dataverse.org/post b/scripts/deploy/phoenix.dataverse.org/post
@@ -12,4 +12,4 @@ scripts/search/populate-users
 scripts/search/create-users
 scripts/search/tests/create-all-and-test
 scripts/search/tests/publish-spruce1-and-test
-java -jar downloads/schemaSpy_5.0.0.jar -t pgsql -host localhost -db dvndb -u postgres -p secret -s public -dp scripts/installer/pgdriver/postgresql-42.2.2.jar -o /var/www/html/schemaspy/latest
+java -jar downloads/schemaSpy_5.0.0.jar -t pgsql -host localhost -db dvndb -u postgres -p secret -s public -dp scripts/installer/pgdriver/postgresql-42.2.9.jar -o /var/www/html/schemaspy/latest
diff --git a/scripts/installer/Makefile b/scripts/installer/Makefile
@@ -46,10 +46,10 @@ ${GLASSFISH_SETUP_SCRIPT}:	glassfish-setup.sh
 	mkdir -p ${INSTALLER_ZIP_DIR}
 	/bin/cp glassfish-setup.sh ${INSTALLER_ZIP_DIR}
 
-${POSTGRES_DRIVERS}:	 pgdriver/postgresql-42.2.2.jar
+${POSTGRES_DRIVERS}:	 pgdriver/postgresql-42.2.9.jar
 	@echo copying postgres driver
 	@mkdir -p ${POSTGRES_DRIVERS}
-	/bin/cp pgdriver/postgresql-42.2.2.jar ${INSTALLER_ZIP_DIR}/pgdriver
+	/bin/cp pgdriver/postgresql-42.2.9.jar ${INSTALLER_ZIP_DIR}/pgdriver
 
 ${API_SCRIPTS}:	../api/setup-datasetfields.sh ../api/setup-users.sh ../api/setup-dvs.sh ../api/setup-identity-providers.sh ../api/setup-all.sh ../api/post-install-api-block.sh ../api/setup-builtin-roles.sh ../api/data
 	@echo copying api scripts

diff --git a/scripts/installer/install b/scripts/installer/install
@@ -182,7 +182,7 @@ my $API_URL = "http://localhost:8080/api";
 # jodbc.postgresql.org recommends 4.2 for Java 8.
 # updated drivers may be obtained from
 #  https://jdbc.postgresql.org/download.html
-my $postgres_jdbc = "postgresql-42.2.2.jar";
+my $postgres_jdbc = "postgresql-42.2.9.jar";
 
 # 0. A few preliminary checks:
 

diff --git a/scripts/installer/install.py b/scripts/installer/install.py
@@ -115,7 +115,7 @@
 # jodbc.postgresql.org recommends 4.2 for Java 8.
 # updated drivers may be obtained from
 #  https://jdbc.postgresql.org/download.html
-pgJdbcDriver = "postgresql-42.2.2.jar"
+pgJdbcDriver = "postgresql-42.2.9.jar"
 
 # 0. A few preliminary checks:                                                                                   
 # 0a. OS flavor:

diff --git a/scripts/installer/pgdriver/postgresql-42.2.2.jar b/scripts/installer/pgdriver/postgresql-42.2.2.jar
diff --git a/scripts/installer/pgdriver/postgresql-42.2.9.jar b/scripts/installer/pgdriver/postgresql-42.2.9.jar
diff --git a/tests/jenkins/groupvars.yml b/tests/jenkins/groupvars.yml
@@ -89,7 +89,7 @@ dataverse:
   postgres:
     reporpm: https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
     version: 9.6
-    jdbcurl: https://jdbc.postgresql.org/download/postgresql-42.2.8.jar
+    jdbcurl: https://jdbc.postgresql.org/download/postgresql-42.2.9.jar
     log_lock_waits: true
   previewers:
     enabled: true