From 56946c9ba4f6ec0607072201e8c87809acf797ae Mon Sep 17 00:00:00 2001
From: Andreas Grimm <a.grimm@bnotk.de>
Date: Mon, 20 Mar 2023 10:51:07 +0100
Subject: [PATCH 1/3] add oracle ucp support

---
 manifests/init.pp        |  3 +++
 templates/server.xml.epp | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 20e84025..3d53f725 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -60,6 +60,8 @@
 #   EHCache configuration for clustered mode
 # @param use_jndi_ds
 #   If true, the database will be configured as JNDI datasource in server.xml and then referenced in dbconfig.xml
+# @param use_ucp
+#   If true, the database will be configured with oracles ucp connection driver
 # @param jndi_ds_name
 #   Configures the JNDI datasource name
 # @param db
@@ -310,6 +312,7 @@
   Optional[Stdlib::Port] $ehcache_object_port                       = undef,
   # Database Settings
   Boolean $use_jndi_ds                                              = false,
+  Boolean $use_ucp                                                  = false,
   String[1] $jndi_ds_name                                           = 'JiraDS',
   Enum['postgresql','mysql','sqlserver','oracle','h2'] $db          = 'postgresql',
   String $dbuser                                                    = 'jiraadm',
diff --git a/templates/server.xml.epp b/templates/server.xml.epp
index a271964e..2a75d7a8 100644
--- a/templates/server.xml.epp
+++ b/templates/server.xml.epp
@@ -117,6 +117,18 @@
                               factory="org.objectweb.jotm.UserTransactionFactory" jotm.timeout="60"/>
 <% if $jira::use_jndi_ds { %>
                     <!-- If you're using JIRA 6.4 or below; change maxTotal to maxActive -->
+  <% if $jira::use_ucp { %>
+                    <Resource name="jdbc/<%= $jira::jndi_ds_name %>" auth="Container" type="oracle.ucp.jdbc.PoolDataSource"
+                            factory="oracle.ucp.jdbc.PoolDataSourceImpl"
+                            connectionFactoryClassName="oracle.jdbc.pool.OracleDataSource"
+                            url="<%= $jira::config::dburl %>"
+                            user="<%= $jira::dbuser %>"
+                            password="<%= $jira::dbpassword %>"
+                            maxTotal="<%= $jira::config::pool_max_size %>"
+                            maxIdle="<%= $jira::config::pool_max_idle %>"
+                            validationQuery="select 1"
+                    />
+  <% } else { %>
                     <Resource name="jdbc/<%= $jira::jndi_ds_name %>" auth="Container" type="javax.sql.DataSource"
                             driverClassName="<%= $jira::config::dbdriver %>"
                             url="<%= $jira::config::dburl %>"

From 4bd3e372aae94a59875fcb434f13dfac33687365 Mon Sep 17 00:00:00 2001
From: Andreas Grimm <a.grimm@bnotk.de>
Date: Wed, 22 Mar 2023 11:18:08 +0100
Subject: [PATCH 2/3] add oracle ucp pool driver

---
 templates/server.xml.epp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/server.xml.epp b/templates/server.xml.epp
index 2a75d7a8..e85977d2 100644
--- a/templates/server.xml.epp
+++ b/templates/server.xml.epp
@@ -117,7 +117,7 @@
                               factory="org.objectweb.jotm.UserTransactionFactory" jotm.timeout="60"/>
 <% if $jira::use_jndi_ds { %>
                     <!-- If you're using JIRA 6.4 or below; change maxTotal to maxActive -->
-  <% if $jira::use_ucp { %>
+  <% if $jira::use_ucp { -%>
                     <Resource name="jdbc/<%= $jira::jndi_ds_name %>" auth="Container" type="oracle.ucp.jdbc.PoolDataSource"
                             factory="oracle.ucp.jdbc.PoolDataSourceImpl"
                             connectionFactoryClassName="oracle.jdbc.pool.OracleDataSource"
@@ -128,7 +128,7 @@
                             maxIdle="<%= $jira::config::pool_max_idle %>"
                             validationQuery="select 1"
                     />
-  <% } else { %>
+  <% } else { -%>
                     <Resource name="jdbc/<%= $jira::jndi_ds_name %>" auth="Container" type="javax.sql.DataSource"
                             driverClassName="<%= $jira::config::dbdriver %>"
                             url="<%= $jira::config::dburl %>"
@@ -138,6 +138,7 @@
                             maxIdle="<%= $jira::config::pool_max_idle %>"
                             validationQuery="select 1"
                     />
+  <% } -%>
 <% } -%>
                     <Manager pathname=""/>
                     <JarScanner scanManifest="false"/>

From f6567ede13832aa2e92a57cbb922854cb6debf1b Mon Sep 17 00:00:00 2001
From: Andreas Grimm <a.grimm@bnotk.de>
Date: Thu, 25 May 2023 15:22:26 +0200
Subject: [PATCH 3/3] add trailing comma in init.pp

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3d53f725..f8e37d37 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -520,7 +520,7 @@
         true    => { password => $plugin_data['password'] }
       }
       $_plugin_archive = {
-        $target => $_target_defaults + $_username + $_password
+        $target => $_target_defaults + $_username + $_password,
       }
       create_resources(archive, $_plugin_archive)
     }