Skip to content

Commit f4e13e7

Browse files
committed
upgrade persistence dependencies
1 parent 9d6f0db commit f4e13e7

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

api/src/main/resources/reference.conf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ include "softnetwork-jdbc-persistence.conf"
22
include "softnetwork-scheduler.conf"
33

44
softnetwork.api.name = "softnetwork-scheduler"
5-
softnetwork.api.version = "0.4.0"
5+
softnetwork.api.version = "0.7-SNAPSHOT"
66
softnetwork.api.server.port = 9000
77
softnetwork.api.server.request-timeout = 120 s
88
softnetwork.api.server.swagger-path-prefix = ["swagger", "scheduler"]
99

10+
# Important: enable HTTP/2 in ActorSystem's config
11+
akka.http.server.preview.enable-http2 = on
12+
1013
akka.cluster.roles = [${softnetwork.scheduler.akka-node-role}]

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
22

33
name := "scheduler"
44

5-
ThisBuild / version := "0.6.3"
5+
ThisBuild / version := "0.7-SNAPSHOT"
66

77
ThisBuild / scalaVersion := "2.12.15"
88

@@ -12,6 +12,7 @@ ThisBuild / javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
1212

1313
ThisBuild / resolvers ++= Seq(
1414
"Softnetwork Server" at "https://softnetwork.jfrog.io/artifactory/releases/",
15+
"Softnetwork snapshots" at "https://softnetwork.jfrog.io/artifactory/snapshots/",
1516
"Maven Central Server" at "https://repo1.maven.org/maven2",
1617
"Typesafe Server" at "https://repo.typesafe.com/typesafe/releases"
1718
)

project/Versions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Versions {
22

3-
val genericPersistence = "0.6.2"
3+
val genericPersistence = "0.7-SNAPSHOT"
44

55
val scalatest = "3.2.16"
66
}

testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerTestKit.scala

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import app.softnetwork.scheduler.persistence.query.Entity2SchedulerProcessorStre
1717
import org.scalatest.Suite
1818
import org.slf4j.{Logger, LoggerFactory}
1919

20-
trait SchedulerTestKit extends SchedulerGuardian with InMemoryPersistenceTestKit { _: Suite =>
20+
trait SchedulerTestKit extends SchedulerGuardian with InMemoryPersistenceTestKit {
21+
_: Suite =>
2122

2223
/** @return
2324
* roles associated with this node
@@ -38,16 +39,24 @@ trait SchedulerTestKit extends SchedulerGuardian with InMemoryPersistenceTestKit
3839
log.info(tag)
3940
}
4041

41-
val probeScheduleAdded: TestProbe[ScheduleAdded] = createTestProbe[ScheduleAdded]()
42-
subscribeProbe(probeScheduleAdded)
42+
lazy val probeScheduleAdded: TestProbe[ScheduleAdded] = createTestProbe[ScheduleAdded]()
4343

44-
val probeScheduleRemoved: TestProbe[ScheduleRemoved] = createTestProbe[ScheduleRemoved]()
45-
subscribeProbe(probeScheduleRemoved)
44+
lazy val probeScheduleRemoved: TestProbe[ScheduleRemoved] = createTestProbe[ScheduleRemoved]()
4645

47-
val probeCronTabAdded: TestProbe[CronTabAdded] = createTestProbe[CronTabAdded]()
48-
subscribeProbe(probeCronTabAdded)
46+
lazy val probeCronTabAdded: TestProbe[CronTabAdded] = createTestProbe[CronTabAdded]()
4947

50-
val probeCronTabRemoved: TestProbe[CronTabRemoved] = createTestProbe[CronTabRemoved]()
51-
subscribeProbe(probeCronTabRemoved)
48+
lazy val probeCronTabRemoved: TestProbe[CronTabRemoved] = createTestProbe[CronTabRemoved]()
49+
50+
def subscribeSchedulerProbes(): Unit = {
51+
subscribeProbe(probeScheduleAdded)
52+
subscribeProbe(probeScheduleRemoved)
53+
subscribeProbe(probeCronTabAdded)
54+
subscribeProbe(probeCronTabRemoved)
55+
}
56+
57+
override def beforeAll(): Unit = {
58+
super.beforeAll()
59+
subscribeSchedulerProbes()
60+
}
5261

5362
}

0 commit comments

Comments
 (0)