Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update quartz #111

Merged
merged 3 commits into from
Jul 23, 2024
Merged

Update quartz #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab6e04b
Update the version of the quartz scheduler
tmccombs Jul 22, 2024
088de07
Ignore .metals directory
tmccombs Jul 22, 2024
49c6dcc
Make compatible with new quartz version
tmccombs Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions worker/src/main/scala/com/lucidchart/piezo/ConnectionProvider.scala
View file
Open in desktop
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
Loading