Skip to content

Commit 616f5e9

Browse files
phearnotphearnot
authored
Bumped Jackson version (#4087)
* Bumped Jackson version * Bumped actions versions * Fixed BlockV5 test
1 parent f1beddd commit 616f5e9

9 files changed

Lines changed: 21 additions & 23 deletions

File tree

‎.github/workflows/check-pr.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
lang-changed: ${{ steps.filter.outputs.lang == 'true' }}
1818
steps:
1919
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
20-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
20+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
2121
with:
2222
distribution: 'temurin'
2323
java-version: '17'
@@ -66,7 +66,7 @@ jobs:
6666
matrix:
6767
os: [macos-15-intel, macos-15, ubuntu-24.04, ubuntu-24.04-arm, windows-2022]
6868
steps:
69-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
69+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
7070
with:
7171
distribution: 'temurin'
7272
java-version: '17'
@@ -91,7 +91,7 @@ jobs:
9191
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9292
with:
9393
repository: ${{ matrix.repo }}
94-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
94+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
9595
with:
9696
distribution: 'temurin'
9797
java-version: '17'
@@ -106,7 +106,7 @@ jobs:
106106
runs-on: ubuntu-latest
107107
steps:
108108
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
109-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
109+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
110110
with:
111111
distribution: 'temurin'
112112
java-version: '17'
@@ -141,7 +141,7 @@ jobs:
141141
PR_NUMBER: ${{ github.event.number }}
142142
steps:
143143
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
144-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
144+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
145145
with:
146146
distribution: 'temurin'
147147
java-version: '17'

‎.github/workflows/on-push-default-branch.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
14-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
14+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
1515
with:
1616
distribution: 'temurin'
1717
java-version: '17'
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
28-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
28+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
2929
with:
3030
distribution: 'temurin'
3131
java-version: '17'

‎.github/workflows/on-release-published.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3232
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
33-
- uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
33+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
3434
with:
3535
username: ${{ secrets.DOCKERHUB_USER }}
3636
password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -58,15 +58,15 @@ jobs:
5858
runs-on: ubuntu-latest
5959
steps:
6060
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
61-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
61+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
6262
with:
6363
distribution: 'temurin'
6464
java-version: '17'
6565
cache: 'sbt'
6666
- uses: sbt/setup-sbt@3afe9cf056c5d139bfc46579af1192d77a2f0821 # v1.4.0
6767
- run: sbt --batch 'buildRIDERunnerForDocker'
6868
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
69-
- uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
69+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
7070
with:
7171
username: ${{ secrets.DOCKERHUB_USER }}
7272
password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
echo "::error::Release version $RELEASE_VERSION does not match SBT version $SBT_VERSION"
105105
exit 1
106-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
106+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
107107
with:
108108
distribution: 'temurin'
109109
java-version: '17'

‎.github/workflows/prepare-release-draft.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
id-token: write
2222
steps:
2323
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
24-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
24+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
2525
with:
2626
distribution: 'temurin'
2727
java-version: '17'

‎.github/workflows/publish-docker-image.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
echo "base-image-digest=$(regctl manifest digest $BASE_IMAGE)" >> "$GITHUB_OUTPUT"
6565
echo "node-version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-)" >> "$GITHUB_OUTPUT"
6666
id: versions
67-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
67+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
6868
with:
6969
distribution: 'temurin'
7070
java-version: '17'
@@ -107,12 +107,12 @@ jobs:
107107
echo EOF
108108
} >> "$GITHUB_OUTPUT"
109109
id: annotations
110-
- uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
110+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
111111
with:
112112
registry: ghcr.io
113113
username: ${{ github.actor }}
114114
password: ${{ secrets.GITHUB_TOKEN }}
115-
- uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
115+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
116116
if: inputs.environment != ''
117117
with:
118118
username: ${{ secrets.DOCKERHUB_USER }}
@@ -174,7 +174,7 @@ jobs:
174174
echo ${{ inputs.docker-tags }} | tr ',' '\n' | sed -e 's/^/type=raw,value=/'
175175
echo EOF
176176
} >> "$GITHUB_ENV"
177-
- uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
177+
- uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
178178
with:
179179
registry: ghcr.io
180180
username: ${{ github.actor }}

‎.github/workflows/publish-to-npmjs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3232
- uses: proudust/gh-describe@80412be8ce0e77d8afba6b340e34790bc772aa45 # v2.2.0
3333
id: ghd
34-
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
34+
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
3535
with:
3636
distribution: 'temurin'
3737
java-version: '17'

‎node-it/src/test/scala/com/wavesplatform/it/sync/BlockV5TestSuite.scala‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ class BlockV5TestSuite extends BaseFreeSpec with ActivationStatusRequest with Op
2626
"block v5 appears and blockchain grows" - {
2727
"check block v5 at current height" in {
2828
nodes.head.waitForHeight(nodes.head.height + 2, 2.minute)
29-
currentHeight = nodes.head.height
3029

31-
val lastBlockCurrentHeight = nodes.head.lastBlock()
3230
val lastBlockHeaderCurrentHeight = nodes.head.lastBlockHeader()
31+
currentHeight = lastBlockHeaderCurrentHeight.height
3332
val blockAtCurrentHeight = nodes.head.blockAt(currentHeight)
3433
val blockHeaderCurrentHeight = nodes.head.blockHeaderAt(currentHeight)
3534
val blockBySignatureCurrentHeight = nodes.head.blockById(blockAtCurrentHeight.id)
@@ -45,7 +44,6 @@ class BlockV5TestSuite extends BaseFreeSpec with ActivationStatusRequest with Op
4544
generationSignatureInBlockJson.arr.length shouldBe Block.GenerationVRFSignatureLength
4645

4746
blockAtCurrentHeight shouldBe blockBySignatureCurrentHeight
48-
blockAtCurrentHeight shouldBe lastBlockCurrentHeight
4947
blockHeaderCurrentHeight shouldBe lastBlockHeaderCurrentHeight
5048
blockAtCurrentHeight.signature shouldBe blockHeaderCurrentHeight.signature
5149
blockAtCurrentHeight.baseTarget shouldBe blockHeaderCurrentHeight.baseTarget

‎project/Dependencies.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Dependencies {
4141

4242
private def kamonModule(module: String) = "io.kamon" %% s"kamon-$module" % "2.8.1"
4343

44-
private def jacksonModule(group: String, module: String, version: String = "2.21.1") = s"com.fasterxml.jackson.$group" % s"jackson-$module" % version
44+
private def jacksonModule(group: String, module: String, version: String = "2.21.4") = s"com.fasterxml.jackson.$group" % s"jackson-$module" % version
4545

4646
private def web3jModule(module: String) = "org.web3j" % module % "4.13.0" // 4.14+ requires Java 21 https://github.com/LFDT-web3j/web3j/releases/tag/v4.14.0
4747

‎project/plugins.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.8")
99
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "1.0.0-alpha.6"
1010

1111
Seq(
12-
"com.eed3si9n" % "sbt-assembly" % "2.4.1",
12+
"com.eed3si9n" % "sbt-assembly" % "2.4.2",
1313
"com.github.sbt" % "sbt-git" % "2.1.0",
1414
"com.github.sbt" % "sbt-native-packager" % "1.11.7",
15-
"com.github.sbt" % "sbt-pgp" % "2.3.1",
15+
"com.github.sbt" % "sbt-pgp" % "2.3.2",
1616
"com.lightbend.sbt" % "sbt-javaagent" % "0.1.6",
1717
"org.portable-scala" % "sbt-scalajs-crossproject" % "1.4.0",
1818
"org.scala-js" % "sbt-scalajs" % "1.22.0",

0 commit comments

Comments
 (0)