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

chore: Patch updates #2910

Merged
merged 10 commits into from
Nov 3, 2023
Merged

chore: Patch updates #2910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34b202a
chore: Update sbt-assembly from 2.1.3 to 2.1.4
daschbot Nov 1, 2023
24a8b23
chore: Update sbt-twirl from 1.6.1 to 1.6.2
daschbot Nov 1, 2023
049302d
chore: Update zio-metrics-connectors from 2.2.0 to 2.2.1
daschbot Nov 1, 2023
550fc67
chore: Update kamon-core from 2.6.4 to 2.6.5
daschbot Nov 1, 2023
e4d241f
chore: Update kamon-scala-future from 2.6.4 to 2.6.5
daschbot Nov 1, 2023
733d6ea
chore: Update scala-library from 2.13.11 to 2.13.12
daschbot Nov 1, 2023
2f62032
chore: Update sbt from 1.9.6 to 1.9.7
daschbot Nov 1, 2023
cbd67bd
chore: Update scalafmt-core from 3.7.14 to 3.7.15
daschbot Nov 1, 2023
7579a45
chore: Update spring-security-core from 6.1.4 to 6.1.5
daschbot Nov 1, 2023
690f574
Merge branch 'main' into update/patches
seakayone Nov 3, 2023
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
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.14"
version = "3.7.15"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
10 changes: 5 additions & 5 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Dependencies {
"daschswiss/apache-jena-fuseki:2.1.2" // should be the same version as in docker-compose.yml, also make sure to use the same version when deploying it (i.e. version in ops-deploy)!
val sipiImage = "daschswiss/sipi:3.8.2" // base image the knora-sipi image is created from

val ScalaVersion = "2.13.11"
val ScalaVersion = "2.13.12"

val PekkoActorVersion = "1.0.1"
val PekkoHttpVersion = "1.0.0"
Expand All @@ -24,7 +24,7 @@ object Dependencies {
val ZioConfigVersion = "3.0.7"
val ZioLoggingVersion = "2.1.14"
val ZioNioVersion = "2.0.2"
val ZioMetricsConnectorsVersion = "2.2.0"
val ZioMetricsConnectorsVersion = "2.2.1"
val ZioPreludeVersion = "1.0.0-RC21"
val ZioSchemaVersion = "0.2.0"
val ZioVersion = "2.0.18"
Expand Down Expand Up @@ -70,8 +70,8 @@ object Dependencies {

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.20.1"
val kamonCore = "io.kamon" %% "kamon-core" % "2.6.4" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.6.4" // Scala 3 incompatible
val kamonCore = "io.kamon" %% "kamon-core" % "2.6.5" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.6.5" // Scala 3 incompatible

// input validation
val commonsValidator =
Expand All @@ -81,7 +81,7 @@ object Dependencies {
val jwtSprayJson = "com.github.jwt-scala" %% "jwt-spray-json" % "9.0.2"
// jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible
val springSecurityCore =
"org.springframework.security" % "spring-security-core" % "6.1.4" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
"org.springframework.security" % "spring-security-core" % "6.1.5" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.76"

// caching
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.9.7
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ resolvers ++= Seq(

addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2")
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.2")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.4")
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.7")
// also update the scalac-scoverage-runtime version in build.sbt
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
Expand Down
Loading