Skip to content

Commit

Permalink
July dependency upgrades (#3115)
Browse files Browse the repository at this point in the history
This is a 3.4.x combination of dependency upgrades that were suggested
by Renovate on the main branch:

 - plugin `gradle.enterprise` to `3.10.3`, supersedes and closes #3071
 - plugin `spotless` to `6.8.0`, supersedes and closes #3072
 - plugin `artifactory` to `4.28.4`, supersedes and closes #3105
 - action `gradle/gradle-build-action` digest to `67421db` (ie. v2.2.1),
  supersedes and closes #3091
 - dependency `byte-buddy` to `1.12.12`, supersedes and closes #3087
  • Loading branch information
simonbasle committed Jul 11, 2022
1 parent e94fe2c commit 5e61f9d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
- uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
name: spotless (license header)
if: always()
with:
arguments: spotlessCheck -PspotlessFrom=origin/${{ github.base_ref }}
- uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
- uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
name: api compatibility
if: always()
with:
Expand All @@ -46,7 +46,7 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
- uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
name: gradle
with:
arguments: :reactor-core:test --no-daemon -Pjunit-tags=!slow
Expand All @@ -60,7 +60,7 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
- uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
name: gradle
with:
arguments: :reactor-core:test --no-daemon -Pjunit-tags=slow
Expand All @@ -74,7 +74,7 @@ jobs:
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
- uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
name: other tests
with:
arguments: check -x :reactor-core:test -x spotlessCheck --no-daemon
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: ./gradlew qualifyVersionGha
- name: run checks
id: checks
uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: check -Pjunit-tags=!slow -x jcstress

Expand All @@ -49,7 +49,7 @@ jobs:
java-version: 8
- name: run slower tests
id: slowerTests
uses: gradle/gradle-build-action@e88ed3e650b26bd116cfee53cf198c1f6856682d # tag=v2
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 # tag=v2
with:
arguments: reactor-core:test -Pjunit-tags=slow jcstress

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ baselinePerfExtra = "3.4.8"

# Other shared versions
asciidoctor = "3.3.2"
bytebuddy = "1.12.10"
bytebuddy = "1.12.12"
jmh = "1.35"
junit = "5.8.2"
kotlin = "1.5.32"
Expand Down Expand Up @@ -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.3" }
artifactory = { id = "com.jfrog.artifactory", version = "4.28.4" }
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.3.1" }
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.7.0" }
spotless = { id = "com.diffplug.spotless", version = "6.8.0" }
testsets = { id = "org.unbroken-dome.test-sets", version = "4.0.0" }
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2021 VMware Inc. or its affiliates, All Rights Reserved.
* Copyright (c) 2011-2022 VMware Inc. or its affiliates, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,7 +14,7 @@
* limitations under the License.
*/
plugins {
id "com.gradle.enterprise" version "3.10.1"
id "com.gradle.enterprise" version "3.10.3"
}

rootProject.name = 'reactor'
Expand Down

0 comments on commit 5e61f9d

Please sign in to comment.