Switch to complete MPCONFIG style of DataSourceDefinition by requirin…

…g Payara 5.2020.5+. IQSS#6819

pom.xml

@@ -26,7 +26,7 @@
         <skipUnitTests>false</skipUnitTests>
 
         <jakartaee-api.version>8.0.0</jakartaee-api.version>
-        <payara.version>5.2020.2</payara.version>
+        <payara.version>5.2020.5</payara.version>
         <postgresql.version>42.2.12</postgresql.version>
         <aws.version>1.11.762</aws.version>
         <commons.logging.version>1.2</commons.logging.version>

src/main/java/edu/harvard/iq/dataverse/util/DataSourceProducer.java

@@ -12,9 +12,7 @@
     // Using PGXADataSource instead of deprecated PGPoolingDataSource
     className = "org.postgresql.xa.PGXADataSource",
     user = "${MPCONFIG=dataverse.db.user}",
-    // Has to be using ALIAS for at least Payara 5.2020.3, as MPCONFIG does not seem to read properly
-    // from alias store while deploying. See upstream https://github.com/payara/Payara/issues/4487 and https://github.com/payara/Payara/issues/4709
-    password = "${ALIAS=dataverse.db.password}",
+    password = "${MPCONFIG=dataverse.db.password}",
     serverName = "${MPCONFIG=dataverse.db.host}",
     url = "jdbc:postgresql://${MPCONFIG=dataverse.db.host}:${MPCONFIG=dataverse.db.port}/${MPCONFIG=dataverse.db.name}",
     minPoolSize = 10,