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

JFrog Xray Security Issues : FastXML (Jackson) & Bouncy Castle #312

Closed
wants to merge 3 commits into from
Closed

JFrog Xray Security Issues : FastXML (Jackson) & Bouncy Castle #312

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
789c8d0
upgrade sbt to 1.3.13
michael-read Jul 16, 2020
3e2c06b
add type Format[skuber.Protocol.Value] to line 405
michael-read Jul 16, 2020
a8d7617
Upgrade Bouncy Castle to 1.66 and Play JSON to 2.9.0 due to security …
michael-read Jul 16, 2020
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
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ val akkaStreamTestKit = "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersi
val snakeYaml = "org.yaml" % "snakeyaml" % "1.25"
val commonsIO = "commons-io" % "commons-io" % "2.6"
val commonsCodec = "commons-codec" % "commons-codec" % "1.14"
val bouncyCastle = "org.bouncycastle" % "bcpkix-jdk15on" % "1.64"
val bouncyCastle = "org.bouncycastle" % "bcpkix-jdk15on" % "1.66"

// the client API request/response handing uses Akka Http
val akkaHttp = "com.typesafe.akka" %% "akka-http" % "10.1.11"
Expand All @@ -24,7 +24,7 @@ val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
val logback = "ch.qos.logback" % "logback-classic" % "1.1.3" % Runtime

// the Json formatters are based on Play Json
val playJson = "com.typesafe.play" %% "play-json" % "2.7.4"
val playJson = "com.typesafe.play" %% "play-json" % "2.9.0"

// Need Java 8 or later as the java.time package is used to represent K8S timestamps
scalacOptions += "-target:jvm-1.8"
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/scala/skuber/json/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ package object format {
(JsPath \ "requests").formatMaybeEmptyMap[Resource.Quantity]
)(Resource.Requirements.apply _, unlift(Resource.Requirements.unapply))

implicit val protocolFmt = Format(enumReads(Protocol, Protocol.TCP), enumWrites)
implicit val protocolFmt: Format[skuber.Protocol.Value] = Format(enumReads(Protocol, Protocol.TCP), enumWrites)

implicit val formatCntrProt: Format[Container.Port] = (
(JsPath \ "containerPort").format[Int] and
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.3.8
sbt.version=1.3.13