From 4a343f99838a02a656b66eb59165ecf394a2ff6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:02:49 +0000 Subject: [PATCH 1/4] Bump errorProneVersion from 2.34.0 to 2.36.0 Bumps `errorProneVersion` from 2.34.0 to 2.36.0. Updates `com.google.errorprone:error_prone_annotations` from 2.34.0 to 2.36.0 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.34.0...v2.36.0) Updates `com.google.errorprone:error_prone_core` from 2.34.0 to 2.36.0 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.34.0...v2.36.0) --- updated-dependencies: - dependency-name: com.google.errorprone:error_prone_annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.errorprone:error_prone_core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index c273c4a6327..84f059d4f53 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf( val autoServiceVersion = "1.1.1" val autoValueVersion = "1.11.0" -val errorProneVersion = "2.34.0" +val errorProneVersion = "2.36.0" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.16" From 5e6f14d5d12cc7b4e4b1c28b557a5ef77f51516c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:03:37 +0000 Subject: [PATCH 2/4] ./gradlew generateLicenseReport --- licenses/more-licenses.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 74b0e258471..696247a52f6 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2025-01-08 15:01:38 PST_ +_2025-01-09 18:03:36 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.18.2` @@ -36,7 +36,7 @@ _2025-01-08 15:01:38 PST_ > - **POM Project URL**: [http://stephenc.github.com/jcip-annotations](http://stephenc.github.com/jcip-annotations) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.34.0` +**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.36.0` > - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) From 9affa9d296013d5513e02f652d19dcf0ff61ae33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:03:40 +0000 Subject: [PATCH 3/4] ./gradlew resolveAndLockAll --write-locks --- agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile | 2 +- agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile | 2 +- agent/agent-tooling/gradle.lockfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 27d49f7ca86..59903972281 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath -com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath io.netty:netty-bom:4.1.116.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 27d49f7ca86..59903972281 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath -com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath io.netty:netty-bom:4.1.116.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index ee803770092..5a8a09e76ff 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -22,7 +22,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath com.github.oshi:oshi-core:6.6.5=runtimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath -com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath com.microsoft.azure:msal4j:1.17.2=runtimeClasspath com.nimbusds:content-type:2.3=runtimeClasspath From 5014db105aeeb78eda7f408b92e2f47b5129dd12 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 8 Jan 2025 15:18:56 -0800 Subject: [PATCH 4/4] disable JavaDurationGetSecondsToToSeconds --- buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts index c23109791e4..3e91bc9a65b 100644 --- a/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts @@ -40,6 +40,9 @@ tasks { // Doesn't work well with Java 8 disable("FutureReturnValueIgnored") + // Needs Java 9+ + disable("JavaDurationGetSecondsToToSeconds") + // Require Guava disable("AutoValueImmutableFields") disable("StringSplitter")