Skip to content

Commit ca261fb

Browse files
Bump com.gradle.enterprise from 3.11.4 to 3.12.1 (#7509)
Bumps com.gradle.enterprise from 3.11.4 to 3.12.2. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.gradle.enterprise&package-manager=gradle&previous-version=3.11.4&new-version=3.12.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent f05420e commit ca261fb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

conventions/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
4444
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
4545
implementation("org.apache.httpcomponents:httpclient:4.5.14")
46-
implementation("org.gradle:test-retry-gradle-plugin:1.5.0")
46+
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.12.1")
4747
implementation("org.owasp:dependency-check-gradle:7.4.3")
4848
implementation("ru.vyarus:gradle-animalsniffer-plugin:1.6.0")
4949
// When updating, also update dependencyManagement/build.gradle.kts

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.gradle.enterprise.gradleplugin.testretry.retry
12
import io.opentelemetry.instrumentation.gradle.OtelJavaExtension
23
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
34
import java.time.Duration
@@ -9,8 +10,6 @@ plugins {
910
codenarc
1011
idea
1112

12-
id("org.gradle.test-retry")
13-
1413
id("otel.errorprone-conventions")
1514
id("otel.spotless-conventions")
1615
id("org.owasp.dependencycheck")
@@ -293,9 +292,10 @@ tasks.withType<Test>().configureEach {
293292
timeout.set(Duration.ofMinutes(15))
294293

295294
retry {
296-
val retryTests = System.getenv("CI") != null || rootProject.hasProperty("retryTests")
297295
// You can see tests that were retried by this mechanism in the collected test reports and build scans.
298-
maxRetries.set(if (retryTests) 5 else 0)
296+
if (System.getenv().containsKey("CI") || rootProject.hasProperty("retryTests")) {
297+
maxRetries.set(5)
298+
}
299299
}
300300

301301
reports {

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pluginManagement {
1414
}
1515

1616
plugins {
17-
id("com.gradle.enterprise") version "3.11.4"
17+
id("com.gradle.enterprise") version "3.12.1"
1818
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
1919
}
2020

0 commit comments

Comments
 (0)