diff --git a/conf/docker-aio/testscripts/install b/conf/docker-aio/testscripts/install
index 5471b536265..86aeea89f0b 100755
--- a/conf/docker-aio/testscripts/install
+++ b/conf/docker-aio/testscripts/install
@@ -15,7 +15,6 @@ export SMTP_SERVER=localhost
export MEM_HEAP_SIZE=2048
export GLASSFISH_DOMAIN=domain1
cd scripts/installer
-cp pgdriver/postgresql-42.2.12.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/doc/sphinx-guides/source/developers/tips.rst b/doc/sphinx-guides/source/developers/tips.rst
index 48b6a874eb3..47265c97eff 100755
--- a/doc/sphinx-guides/source/developers/tips.rst
+++ b/doc/sphinx-guides/source/developers/tips.rst
@@ -176,7 +176,6 @@ Switching from Glassfish to Payara
If you already have a working dev environment with Glassfish and want to switch to Payara, you must do the following:
- Copy the "domain1" directory from Glassfish to Payara.
-- Copy the PostgreSQL driver into place like this: ``cp scripts/installer/pgdriver/postgresql-42.*.jar /usr/local/payara5/glassfish/lib``
----
diff --git a/pom.xml b/pom.xml
index 2f568926c78..bdd60965137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
8.0.0
5.2020.6
+ 42.2.18
1.11.762
1.2
4.5.5
@@ -263,6 +264,11 @@
jbcrypt
0.3m
+
+ org.postgresql
+ postgresql
+ ${postgresql.version}
+
org.flywaydb
flyway-core
diff --git a/scripts/database/homebrew/devinstall b/scripts/database/homebrew/devinstall
index 89284b50979..28f682685ff 100755
--- a/scripts/database/homebrew/devinstall
+++ b/scripts/database/homebrew/devinstall
@@ -15,6 +15,5 @@ export FILES_DIR=$HOME/dataverse/files
export MEM_HEAP_SIZE=2048
export GLASSFISH_DOMAIN=domain1
export GLASSFISH_ROOT=/Applications/NetBeans/glassfish4
-cp pgdriver/postgresql-9.1-902.jdbc4.jar $GLASSFISH_ROOT/glassfish/lib
cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
./glassfish-setup.sh
diff --git a/scripts/deploy/phoenix.dataverse.org/install b/scripts/deploy/phoenix.dataverse.org/install
index f3df88a3fd2..8ee7fb8215f 100755
--- a/scripts/deploy/phoenix.dataverse.org/install
+++ b/scripts/deploy/phoenix.dataverse.org/install
@@ -15,6 +15,5 @@ export SMTP_SERVER=localhost
export MEM_HEAP_SIZE=2048
export GLASSFISH_DOMAIN=domain1
cd scripts/installer
-cp pgdriver/postgresql-8.4-703.jdbc4.jar $GLASSFISH_ROOT/glassfish/lib
cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
./glassfish-setup.sh
diff --git a/scripts/installer/Makefile b/scripts/installer/Makefile
index 5155edfde1f..4ef35a01471 100644
--- a/scripts/installer/Makefile
+++ b/scripts/installer/Makefile
@@ -1,7 +1,6 @@
INSTALLER_ZIP_DIR=dvinstall
DISTRIBUTION_WAR_FILE=${INSTALLER_ZIP_DIR}/dataverse.war
GLASSFISH_SETUP_SCRIPT=${INSTALLER_ZIP_DIR}/as-setup.sh
-POSTGRES_DRIVERS=${INSTALLER_ZIP_DIR}/pgdriver
API_SCRIPTS=${INSTALLER_ZIP_DIR}/setup-datasetfields.sh ${INSTALLER_ZIP_DIR}/setup-users.sh ${INSTALLER_ZIP_DIR}/setup-builtin-roles.sh ${INSTALLER_ZIP_DIR}/setup-dvs.sh ${INSTALLER_ZIP_DIR}/data ${INSTALLER_ZIP_DIR}/setup-identity-providers.sh ${INSTALLER_ZIP_DIR}/setup-all.sh ${INSTALLER_ZIP_DIR}/post-install-api-block.sh
JHOVE_CONFIG=${INSTALLER_ZIP_DIR}/jhove.conf
JHOVE_SCHEMA=${INSTALLER_ZIP_DIR}/jhoveConfig.xsd
@@ -15,9 +14,9 @@ installer: dvinstall.zip
clean:
/bin/rm -rf ${INSTALLER_ZIP_DIR} dvinstall.zip
-dvinstall.zip: ${GLASSFISH_SETUP_SCRIPT} ${POSTGRES_DRIVERS} ${JSF_PATCH_DIR} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${PYTHON_FILES} ${INSTALL_SCRIPT}
+dvinstall.zip: ${GLASSFISH_SETUP_SCRIPT} ${JSF_PATCH_DIR} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${PYTHON_FILES} ${INSTALL_SCRIPT}
@echo making installer...
- zip -r dvinstall.zip ${GLASSFISH_SETUP_SCRIPT} ${POSTGRES_DRIVERS} ${JSF_PATCH_DIR} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${PYTHON_FILES} ${INSTALL_SCRIPT}
+ zip -r dvinstall.zip ${GLASSFISH_SETUP_SCRIPT} ${JSF_PATCH_DIR} ${DISTRIBUTION_WAR_FILE} ${API_SCRIPTS} ${JHOVE_CONFIG} ${JHOVE_SCHEMA} ${SOLR_SCHEMA} ${SOLR_CONFIG} ${PYTHON_FILES} ${INSTALL_SCRIPT}
@echo
@echo "Done!"
@@ -45,11 +44,6 @@ ${GLASSFISH_SETUP_SCRIPT}: as-setup.sh ${INSTALLER_ZIP_DIR}
@echo copying glassfish setup
/bin/cp as-setup.sh ${INSTALLER_ZIP_DIR}
-${POSTGRES_DRIVERS}: pgdriver/postgresql-42.2.12.jar
- mkdir -p ${POSTGRES_DRIVERS}
- @echo copying postgres driver
- /bin/cp pgdriver/postgresql-42.2.12.jar ${POSTGRES_DRIVERS}
-
${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 ${INSTALLER_ZIP_DIR}
@echo copying api scripts
/bin/cp -R ../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 ${INSTALLER_ZIP_DIR}
diff --git a/scripts/installer/README.txt b/scripts/installer/README.txt
index ec11881c720..35dbaadc3bf 100644
--- a/scripts/installer/README.txt
+++ b/scripts/installer/README.txt
@@ -20,7 +20,6 @@ from scripts/installer (this directory):
install
glassfish-setup.sh
-pgdriver (the entire directory with all its contents)
from scripts/api:
diff --git a/scripts/installer/install b/scripts/installer/install
index ffe98d48720..b30ad7982bc 100755
--- a/scripts/installer/install
+++ b/scripts/installer/install
@@ -840,19 +840,6 @@ sub setup_appserver {
# with the MacOS glassfish build...). Verify, and if still the case,
# add a check.
- print "\nInstalling the PostgresQL driver for Payara5... ";
-# system( "/bin/cp", "pgdriver/" . $postgres_jdbc, $glassfish_dir . "/glassfish/lib" );
- my $pgdriver_success = copy("pgdriver/" . $postgres_jdbc, $glassfish_dir . "/glassfish/lib" );
-
- unless ($pgdriver_success)
- {
- print "\n*********************\n";
- print "ERROR! Failed to copy the postgres driver into " . $glassfish_dir . "/glassfish/lib - check the directory permissions!\n";
- exit 1;
- }
-
- print "done!\n";
-
print "\n*********************\n";
print "PLEASE NOTE, SOME OF THE ASADMIN COMMANDS ARE GOING TO FAIL,\n";
print "FOR EXAMPLE, IF A CONFIGURATION SETTING THAT WE ARE TRYING\n";
diff --git a/scripts/installer/install.py b/scripts/installer/install.py
index 40f91cea640..ce74ccffb69 100644
--- a/scripts/installer/install.py
+++ b/scripts/installer/install.py
@@ -111,12 +111,6 @@
# expected dataverse defaults
apiUrl = "http://localhost:8080/api"
-# there's now a single driver that works for all supported versions:
-# 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.12.jar"
-
# 0. A few preliminary checks:
# 0a. OS flavor:
@@ -441,15 +435,6 @@
print("Setting App. Server heap size (Xmx) to "+str(gfHeap)+" Megabytes")
config.set('glassfish','GLASSFISH_HEAP', str(gfHeap))
-# 4b1. PostgresQL driver:
-pg_driver_jarpath = "pgdriver/"+pgJdbcDriver
-
-try:
- copy2(pg_driver_jarpath, gfJarPath)
- print("Copied "+pgJdbcDriver+" into "+gfJarPath)
-except:
- print("Couldn't copy "+pgJdbcDriver+" into "+gfJarPath+". Check its permissions?")
-
# 4c. create payara admin credentials file
userHomeDir = pwd.getpwuid(os.getuid())[5]
diff --git a/scripts/installer/pgdriver/postgresql-42.2.12.jar b/scripts/installer/pgdriver/postgresql-42.2.12.jar
deleted file mode 100644
index 1f393bb78f7..00000000000
Binary files a/scripts/installer/pgdriver/postgresql-42.2.12.jar and /dev/null differ