From ab6e04b648e7556b8c611c2159cb840206907b10 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Mon, 22 Jul 2024 14:35:20 -0600 Subject: [PATCH 1/3] Update the version of the quartz scheduler --- admin/build.sbt | 2 +- worker/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/build.sbt b/admin/build.sbt index 95f3cec..1506497 100644 --- a/admin/build.sbt +++ b/admin/build.sbt @@ -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 ) diff --git a/worker/build.sbt b/worker/build.sbt index 13834cd..dea0b67 100644 --- a/worker/build.sbt +++ b/worker/build.sbt @@ -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", From 088de0727cd8dd81e7239c33fb20ca7d7ec7c233 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Mon, 22 Jul 2024 14:35:36 -0600 Subject: [PATCH 2/3] Ignore .metals directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d473315..2291d85 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ project/plugins/project/ .idea .idea_modules .bsp +.metals From 49c6dcc1ae2aa45ebc5973437970532c07733d15 Mon Sep 17 00:00:00 2001 From: Thayne McCombs Date: Mon, 22 Jul 2024 14:49:43 -0600 Subject: [PATCH 3/3] Make compatible with new quartz version PoolingConnectionProvider is now an interface, so we need to use the concrete HikariCpPoolingConnectionProvider --- .../main/scala/com/lucidchart/piezo/ConnectionProvider.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/src/main/scala/com/lucidchart/piezo/ConnectionProvider.scala b/worker/src/main/scala/com/lucidchart/piezo/ConnectionProvider.scala index 3791c0f..337794a 100644 --- a/worker/src/main/scala/com/lucidchart/piezo/ConnectionProvider.scala +++ b/worker/src/main/scala/com/lucidchart/piezo/ConnectionProvider.scala @@ -1,6 +1,6 @@ package com.lucidchart.piezo -import org.quartz.utils.PoolingConnectionProvider +import org.quartz.utils.HikariCpPoolingConnectionProvider import java.util.Properties import org.slf4j.LoggerFactory @@ -8,7 +8,7 @@ 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"),