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

[WM-2400] Upgrade logback-classic dependency to fix vulnerability #331

Merged
merged 24 commits into from
Dec 21, 2023
Merged

[WM-2400] Upgrade logback-classic dependency to fix vulnerability #331

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6d08ebe
update logback dependency
salonishah11 Dec 20, 2023
294cbac
try mongo 5.0.23 version
salonishah11 Dec 21, 2023
9f163af
try mongo 6.0.12 version
salonishah11 Dec 21, 2023
ee42e4c
try mongo 7.0.4 version
salonishah11 Dec 21, 2023
0bcaf4a
remove space
salonishah11 Dec 21, 2023
781d3e6
revert mongo to 4.4; update jackson-core to 2.15.0
salonishah11 Dec 21, 2023
73f173d
revert jackson-core; update testcontainers to 1.19.3
salonishah11 Dec 21, 2023
2ea3d3a
update testcontainers to 0.41.0
salonishah11 Dec 21, 2023
656d1b7
revert testContainers; remove trusty as default
salonishah11 Dec 21, 2023
154babe
default to jammy; add make install
salonishah11 Dec 21, 2023
1ac0947
do what Cromwell does
salonishah11 Dec 21, 2023
839fd6f
cd out
salonishah11 Dec 21, 2023
a1c38af
ls -la
salonishah11 Dec 21, 2023
c004fb9
add backslash
salonishah11 Dec 21, 2023
9660012
add &
salonishah11 Dec 21, 2023
033273a
cd out
salonishah11 Dec 21, 2023
6e371ce
revert git-secret changes; use focal
salonishah11 Dec 21, 2023
64c3359
remove extra directory
salonishah11 Dec 21, 2023
8a49566
debugging
salonishah11 Dec 21, 2023
cda5ea5
remove directory
salonishah11 Dec 21, 2023
e5ab7e9
pull docker image directly
salonishah11 Dec 21, 2023
50c26fd
update jackson to 2.15.2
salonishah11 Dec 21, 2023
3a1047c
Add merge strategy
salonishah11 Dec 21, 2023
76182a3
Merge branch 'develop' into sps_update_logback_dependency
salonishah11 Dec 21, 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
3 changes: 2 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resolvers += "artifactory-releases" at artifactory + "libs-release"
resolvers += "artifactory-snapshots" at artifactory + "libs-snapshot"

libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.2.11",
"ch.qos.logback" % "logback-classic" % "1.4.14",
"com.google.api-client" % "google-api-client" % "1.25.0" excludeAll ExclusionRule(organization = "com.google.guava"),
"com.google.apis" % "google-api-services-admin-directory" % "directory_v1-rev118-1.25.0" excludeAll
ExclusionRule(organization = "com.google.guava"),
Expand Down Expand Up @@ -116,6 +116,7 @@ assemblyMergeStrategy in assembly := {
MergeStrategy.concat
case x if x.endsWith("io.netty.versions.properties") =>
MergeStrategy.discard
case x if x.endsWith("module-info.class") => MergeStrategy.discard
case PathList(ps@_*) if Assembly.isReadme(ps.last) || Assembly.isLicenseFile(ps.last) =>
MergeStrategy.rename
case PathList("META-INF", xs@_*) =>
Expand Down