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

Jump to bottom

Play 3.0.0 upgrade & vulnerabilty fixes #114

Merged
merged 6 commits into from
Nov 17, 2023
Merged

Play 3.0.0 upgrade & vulnerabilty fixes #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bdddfa
Update Play to 2.9.0
AshCorr Nov 2, 2023
286a2e2
Update various transient dependencies which don't have easy upgrades …
AshCorr Nov 2, 2023
3c40725
Document reasons for updating transient dependencies
AshCorr Nov 2, 2023
5e317bf
Only bump `okhttp` to 3.4.0 instead of 4.12.0
AshCorr Nov 2, 2023
dd78da8
Bump Play to 3.0 and use latest version of play-git-hub
AshCorr Nov 14, 2023
c9e27f7
Use play-git-hub 6
AshCorr Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/Application.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package controllers

import akka.actor.ActorSystem
import org.apache.pekko.actor.ActorSystem
import com.madgag.scalagithub.model.RepoId
import lib.{Bot, RepoSnapshot}
import play.api.Logging
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/RepoAcceptListService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controllers

import akka.actor.ActorSystem
import akka.stream.Materializer
import org.apache.pekko.actor.ActorSystem
import org.apache.pekko.stream.Materializer
import com.madgag.github.Implicits._
import com.madgag.scalagithub.GitHub
import com.madgag.scalagithub.model.{Repo, RepoId}
Expand Down
2 changes: 1 addition & 1 deletion app/lib/Delayer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib

import akka.actor.ActorSystem
import org.apache.pekko.actor.ActorSystem

import java.util.concurrent.TimeUnit
import scala.concurrent.ExecutionContext.Implicits.global
Expand Down
2 changes: 1 addition & 1 deletion app/lib/Droid.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib

import akka.stream.Materializer
import org.apache.pekko.stream.Materializer
import com.madgag.git._
import com.madgag.scalagithub.GitHub
import com.madgag.scalagithub.model.RepoId
Expand Down
2 changes: 1 addition & 1 deletion app/lib/PRUpdater.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib

import akka.stream.Materializer
import org.apache.pekko.stream.Materializer
import com.madgag.scalagithub.GitHub
import com.madgag.scalagithub.commands.CreateComment
import com.madgag.scalagithub.model.{PullRequest, Repo}
Expand Down
2 changes: 1 addition & 1 deletion app/lib/RepoSnapshot.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package lib

import akka.stream.Materializer
import org.apache.pekko.stream.Materializer
import com.madgag.git._
import com.madgag.github.Implicits._
import com.madgag.scala.collection.decorators._
Expand Down
2 changes: 1 addition & 1 deletion app/lib/RepoUpdater.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib

import akka.stream.Materializer
import org.apache.pekko.stream.Materializer
import com.madgag.github.Implicits.{RichFuture, RichSource}
import com.madgag.scalagithub.GitHub
import com.madgag.scalagithub.commands.CreateLabel
Expand Down
4 changes: 2 additions & 2 deletions app/lib/ScanScheduler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package lib

import akka.actor.ActorSystem
import org.apache.pekko.actor.ActorSystem

import java.time.Instant
import java.time.Instant.now
Expand All @@ -11,7 +11,7 @@ import com.madgag.scalagithub.model.RepoId
import com.madgag.time.Implicits._
import lib.labels.Seen
import play.api.Logging
import play.api.libs.concurrent.Akka
import play.api.libs.concurrent.Pekko

import java.util.concurrent.atomic.AtomicReference
import scala.concurrent.ExecutionContext.Implicits.global
Expand Down
11 changes: 9 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,19 @@ libraryDependencies ++= Seq(
"com.github.nscala-time" %% "nscala-time" % "2.32.0",
"io.lemonlabs" %% "scala-uri" % "4.0.3",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"com.madgag.play-git-hub" %% "core" % "5.10",
"com.madgag.play-git-hub" %% "testkit" % "5.10" % Test,
"com.madgag.play-git-hub" %% "core" % "6.0",
"com.madgag.play-git-hub" %% "testkit" % "6.0" % Test,
"com.madgag.scala-git" %% "scala-git-test" % "4.6" % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test
)

// Overidden transient dependencies for Vulnerability fixes
libraryDependencies ++= Seq(
// Introduced through org.webjars:bootstrap:3.4.1
// Fix available in next major bootstrap version - this will involve a lot of breaking changes however.
"org.webjars" % "jquery" % "3.6.4",
)

routesImport ++= Seq("com.madgag.scalagithub.model._","com.madgag.playgithub.Binders._")

Compile/doc/sources := Seq.empty
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.3
sbt.version=1.9.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.0")

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

Expand Down