Skip to content

Commit 5c36649

Browse files
Merge branch 'main' into fix/deprecate-disable-transactions
2 parents bb7bb42 + 62139f7 commit 5c36649

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ jobs:
154154
needs: [publish-maven-central, publish-github-packages]
155155
permissions:
156156
contents: write
157-
uses: openfga/.github/.github/workflows/undraft-release.yml@main
157+
uses: openfga/.github/.github/workflows/undraft-release.yml@835baf31562809ad9eb884c73efc5b79318f700f # pin@main

.github/workflows/pr-title-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
pr-title-check:
1414
permissions:
1515
pull-requests: read
16-
uses: openfga/.github/.github/workflows/pr-title-check.yml@main
16+
uses: openfga/.github/.github/workflows/pr-title-check.yml@835baf31562809ad9eb884c73efc5b79318f700f # pin@main
1717

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: |
3737
github.event_name == 'workflow_dispatch' ||
3838
startsWith(github.event.head_commit.message, 'release:')
39-
uses: openfga/.github/.github/workflows/release-please.yml@main
39+
uses: openfga/.github/.github/workflows/release-please.yml@835baf31562809ad9eb884c73efc5b79318f700f # pin@main
4040
with:
4141
trigger-event: ${{ github.event_name }}
4242
bump-type: ${{ inputs.bump-type || 'auto' }}

build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ ext {
5858
jackson_version = "2.22.0"
5959
}
6060

61+
configurations.testRuntimeClasspath {
62+
// handlebars 4.3.1 (pulled in by wiremock) has a path traversal CVE fixed in 4.5.2.
63+
// WireMock 3.x hasn't backported the fix — only the 4.x beta line has.
64+
// We force the core jar only; handlebars-helpers cannot be forced to 4.5.2 because
65+
// NumberHelper moved packages between versions, which breaks WireMock at runtime.
66+
resolutionStrategy.force 'com.github.jknack:handlebars:4.5.2'
67+
}
68+
6169
dependencies {
6270
implementation "com.google.code.findbugs:jsr305:3.0.2"
6371

0 commit comments

Comments
 (0)