From 14e1f1f1887391a4cf61f830d7644293477bb24b Mon Sep 17 00:00:00 2001 From: Marcos Silva Cunha Date: Sat, 7 Oct 2023 01:46:55 -0300 Subject: [PATCH 1/2] Fixes for vulnerabilities related by Snyk - Bump Scala to 2.13.9, Play to 2.8.16, SQLite-JDBC to 3.41.2.2 --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 10ead91..43a98a5 100644 --- a/build.sbt +++ b/build.sbt @@ -7,9 +7,9 @@ packageSummary := "Elasticsearch web admin tool" packageDescription := """cerebro is an open source(MIT License) elasticsearch web admin tool built using Scala, Play Framework, AngularJS and Bootstrap.""" -version := "0.9.4" +version := "0.9.5" -scalaVersion := "2.13.4" +scalaVersion := "2.13.9" rpmVendor := "lmenezes" @@ -18,11 +18,11 @@ rpmLicense := Some("MIT") rpmUrl := Some("http://github.com/lmenezes/cerebro") libraryDependencies ++= Seq( - "com.typesafe.play" %% "play" % "2.8.7", + "com.typesafe.play" %% "play" % "2.8.16", "com.typesafe.play" %% "play-json" % "2.9.1", "com.typesafe.play" %% "play-slick" % "5.0.0", "com.typesafe.play" %% "play-slick-evolutions" % "5.0.0", - "org.xerial" % "sqlite-jdbc" % "3.34.0", + "org.xerial" % "sqlite-jdbc" % "3.41.2.2", "org.specs2" %% "specs2-junit" % "4.10.0" % "test", "org.specs2" %% "specs2-core" % "4.10.0" % "test", "org.specs2" %% "specs2-mock" % "4.10.0" % "test" From 2952d7c73cb8c827d86898daa1b053942e8c7d43 Mon Sep 17 00:00:00 2001 From: Marcos Silva Cunha Date: Sat, 7 Oct 2023 01:53:06 -0300 Subject: [PATCH 2/2] GitHub Actions to run on branch main --- .github/workflows/scala.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index d5e55c7..5db4dc9 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -2,9 +2,9 @@ name: build on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build_backend: