Skip to content

Commit

Permalink
Merge pull request #111 from lucidsoftware/update-quartz
Browse files Browse the repository at this point in the history
Update quartz
  • Loading branch information
tmccombs authored Jul 23, 2024
2 parents 7d03de5 + 49c6dcc commit 0267607
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ project/plugins/project/
.idea
.idea_modules
.bsp
.metals
2 changes: 1 addition & 1 deletion admin/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ libraryDependencies ++= Seq(
jdbc,
"org.ow2.asm" % "asm" % "8.0.1",
"ch.qos.logback" % "logback-classic" % "1.2.3",
"org.quartz-scheduler" % "quartz" % "2.1.7",
"org.quartz-scheduler" % "quartz" % "2.3.2",
"com.softwaremill.macwire" %% "macros" % "2.3.3" % "provided",
specs2 % Test
)
Expand Down
2 changes: 1 addition & 1 deletion worker/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ run / connectInput := true

libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.0.7" % Provided,
"org.quartz-scheduler" % "quartz" % "2.1.7",
"org.quartz-scheduler" % "quartz" % "2.3.2",
"org.slf4j" % "slf4j-api" % "1.7.25",
"org.specs2" %% "specs2-core" % "4.5.1" % Test,
"mysql" % "mysql-connector-java" % "8.0.32",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.lucidchart.piezo

import org.quartz.utils.PoolingConnectionProvider
import org.quartz.utils.HikariCpPoolingConnectionProvider
import java.util.Properties
import org.slf4j.LoggerFactory

class ConnectionProvider(props: Properties) {
val logger = LoggerFactory.getLogger(this.getClass)
private val dataSource = props.getProperty("org.quartz.jobStore.dataSource")
private val provider = if(dataSource != null) {
Some(new PoolingConnectionProvider(
Some(new HikariCpPoolingConnectionProvider(
props.getProperty("org.quartz.dataSource." + dataSource + ".driver"),
props.getProperty("org.quartz.dataSource." + dataSource + ".URL"),
props.getProperty("org.quartz.dataSource." + dataSource + ".user"),
Expand Down

0 comments on commit 0267607

Please sign in to comment.