Skip to content

Commit

Permalink
Upgrade Mockito, Spotless, Artifactory, Checkout action
Browse files Browse the repository at this point in the history
This commit contains the following upgrades:
 - test dependency Mockito to v4.5.1 (supersedes and closes #3022)
 - plugin Artifactory to v4.28.2 (supersedes and closes #3027)
 - plugin Spotless to v6.5.0 (supersedes and closes #3000)
 - action Checkout to `7884fca` ie. v2.4.2 (supersedes and closes #3020)
  • Loading branch information
simonbasle committed Apr 26, 2022
1 parent adaec72 commit 30ae3bc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: preliminary sanity checks
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
with:
fetch-depth: 0 #needed by spotless
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
needs: preliminary
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
distribution: 'temurin'
Expand All @@ -55,7 +55,7 @@ jobs:
runs-on: ubuntu-latest
needs: preliminary
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
distribution: 'temurin'
Expand All @@ -69,7 +69,7 @@ jobs:
runs-on: ubuntu-latest
needs: preliminary
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ jobs:
name: "validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b # renovate: tag=v1
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
versionType: ${{ steps.version.outputs.versionType }}
fullVersion: ${{ steps.version.outputs.fullVersion }}
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- name: setup java
uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
Expand All @@ -41,7 +41,7 @@ jobs:
name: slowerChecks
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- name: setup java
uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
Expand All @@ -61,7 +61,7 @@ jobs:
if: needs.prepare.outputs.versionType == 'SNAPSHOT'
environment: snapshots
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
distribution: 'temurin'
Expand All @@ -81,7 +81,7 @@ jobs:
if: needs.prepare.outputs.versionType == 'MILESTONE'
environment: releases
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
distribution: 'temurin'
Expand All @@ -103,7 +103,7 @@ jobs:
if: needs.prepare.outputs.versionType == 'RELEASE'
environment: releases
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2
with:
distribution: 'temurin'
Expand All @@ -126,7 +126,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- name: tag
run: |
git config --local user.name 'reactorbot'
Expand All @@ -141,7 +141,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2
- uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # tag=v2
- name: tag
run: |
git config --local user.name 'reactorbot'
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
logback = "ch.qos.logback:logback-classic:1.2.11"
micrometer = "io.micrometer:micrometer-core:1.3.0"
mockito = "org.mockito:mockito-core:4.4.0"
mockito = "org.mockito:mockito-core:4.5.1"
reactiveStreams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactiveStreams" }
reactiveStreams-tck = { module = "org.reactivestreams:reactive-streams-tck", version.ref = "reactiveStreams" }
reactor-perfBaseline-core = { module = "io.projectreactor:reactor-core", version.ref = "baselinePerfCore" }
Expand All @@ -39,7 +39,7 @@ testNg = "org.testng:testng:7.5"
throwingFunction = "com.pivovarit:throwing-function:1.5.1"

[plugins]
artifactory = { id = "com.jfrog.artifactory", version = "4.28.1" }
artifactory = { id = "com.jfrog.artifactory", version = "4.28.2" }
asciidoctor-convert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor" }
asciidoctor-pdf = { id = "org.asciidoctor.jvm.pdf", version.ref = "asciidoctor" }
bnd = { id = "biz.aQute.bnd.builder", version = "6.2.0" }
Expand All @@ -49,5 +49,5 @@ jcstress = { id = "io.github.reyerizo.gradle.jcstress", version = "0.8.13" }
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
nohttp = { id = "io.spring.nohttp", version = "0.0.10" }
shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
spotless = { id = "com.diffplug.spotless", version = "6.4.1" }
spotless = { id = "com.diffplug.spotless", version = "6.5.0" }
testsets = { id = "org.unbroken-dome.test-sets", version = "4.0.0" }

0 comments on commit 30ae3bc

Please sign in to comment.