From 3cb1a32b7387d87806c055e3e110348847503ebf Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Wed, 15 Jun 2022 10:17:15 -0400 Subject: [PATCH 1/2] The mockito error-prone library is no longer included by default It has produced a substantially highter maintenance burden than we're willing to accept, impacting the error_prone version used in consumers before we're ready to adopt releases. For example, https://github.com/google/error-prone/issues/3225 results in build failures when 2.14.0 is adopted. --- baseline-error-prone/build.gradle | 3 +-- versions.lock | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/baseline-error-prone/build.gradle b/baseline-error-prone/build.gradle index 688182976..33c61aa64 100644 --- a/baseline-error-prone/build.gradle +++ b/baseline-error-prone/build.gradle @@ -7,7 +7,6 @@ dependencies { implementation 'com.google.errorprone:error_prone_core' // Ensure a new enough version of dataflow-errorprone is available implementation 'org.checkerframework:dataflow-errorprone' - runtimeOnly 'org.mockito:mockito-errorprone' testImplementation gradleApi() testImplementation 'com.palantir.tokens:auth-tokens' @@ -70,4 +69,4 @@ moduleJvmArgs { 'jdk.compiler/com.sun.tools.javac.util' ] opens = ['jdk.compiler/com.sun.tools.javac.comp'] -} \ No newline at end of file +} diff --git a/versions.lock b/versions.lock index 3cfadc8f3..cbcb1f5a1 100644 --- a/versions.lock +++ b/versions.lock @@ -17,7 +17,7 @@ com.google.code.findbugs:jsr305:3.0.2 (6 constraints: 66626968) com.google.errorprone:error_prone_annotation:2.13.1 (3 constraints: c138e9ec) com.google.errorprone:error_prone_annotations:2.13.1 (12 constraints: 82bdf88c) com.google.errorprone:error_prone_check_api:2.13.1 (2 constraints: b025d4fe) -com.google.errorprone:error_prone_core:2.13.1 (3 constraints: f4251b64) +com.google.errorprone:error_prone_core:2.13.1 (2 constraints: 0f189366) com.google.errorprone:error_prone_refaster:2.13.1 (1 constraints: 3905393b) com.google.errorprone:error_prone_test_helpers:2.13.1 (1 constraints: 3905393b) com.google.errorprone:error_prone_type_annotations:2.13.1 (1 constraints: 24114cc9) @@ -86,8 +86,7 @@ org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b359e) org.hamcrest:hamcrest-library:2.2 (1 constraints: fc138e38) org.immutables:value:2.8.8 (1 constraints: 14051536) org.inferred:freebuilder:1.14.6 (1 constraints: 3e053b3b) -org.mockito:mockito-core:4.5.1 (4 constraints: a4328ec8) -org.mockito:mockito-errorprone:4.5.1 (1 constraints: 0c050f36) +org.mockito:mockito-core:4.5.1 (3 constraints: ec24cefa) org.objenesis:objenesis:3.2 (2 constraints: 9a17f457) org.ow2.asm:asm:9.3 (3 constraints: e92232eb) org.pcollections:pcollections:3.1.4 (1 constraints: f51029b8) From 49d5f6bf98997e93e5af8174a1a79f0de0d1fe1e Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Wed, 15 Jun 2022 14:19:39 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-2302.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-2302.v2.yml diff --git a/changelog/@unreleased/pr-2302.v2.yml b/changelog/@unreleased/pr-2302.v2.yml new file mode 100644 index 000000000..730dfc751 --- /dev/null +++ b/changelog/@unreleased/pr-2302.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: The mockito error-prone library is no longer included by default + links: + - https://github.com/palantir/gradle-baseline/pull/2302