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

Update protobuf-java to 3.25.5 if otherwise present in the project dependencies #91

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Update protobuf-java to 3.25.5 if otherwise present in the project dependencies #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,28 @@ jobs:
with:
modules-ignore: smithy4s-preprocessors_2.12
configs-ignore: test scala-tool scala-doc-tool test-internal

validate-steward:
name: Validate Steward Config
strategy:
matrix:
os: [ubuntu-latest]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (fast)
uses: actions/checkout@v4

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11

- uses: coursier/setup-action@v1
with:
apps: scala-steward

- run: scala-steward validate-repo-config .scala-steward.conf
1 change: 1 addition & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pull_request_rules:
- body~=labels:.*early-semver-minor
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
- status-success=Build and Test (ubuntu-latest, 3, temurin@8)
- status-success=Validate Steward Config (ubuntu-latest, temurin@11)
actions:
merge: {}
- name: Label rules PRs
Expand Down
3 changes: 3 additions & 0 deletions .scala-steward.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
updates.pin = [
{ groupId = "com.google.protobuf", artifactId = "protobuf-java", version = "3." } # used transitively by ScalaMeta; CVE-2024-7254
]
4 changes: 4 additions & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ ThisBuild / tlJdkRelease := Some(8)
ThisBuild / githubWorkflowBuild := List(Sbt(List("compile", "test")))
ThisBuild / tlCiReleaseBranches := Seq("main")
ThisBuild / sonatypeCredentialHost := xerial.sbt.Sonatype.sonatypeLegacy
ThisBuild / mergifyRequiredJobs ++= Seq("validate-steward")
ThisBuild / mergifyStewardConfig ~= { _.map {
_.withAuthor("dwolla-oss-scala-steward[bot]")
.withMergeMinors(true)
Expand Down Expand Up @@ -50,6 +51,9 @@ lazy val `scalafix-rules` = project.in(file("scalafix/rules"))
"org.scalameta" %% "munit" % "1.0.0" % Test,
"com.eed3si9n.expecty" %% "expecty" % "0.16.0" % Test,
),
dependencyOverrides ++= Seq(
"com.google.protobuf" % "protobuf-java" % "3.25.5", // CVE-2024-7254
),
scalacOptions ~= {
_.filterNot(_ == "-Xfatal-warnings")
},
Expand Down