From 04bf0300b8736ec7297a34da40a6efb21231c5da Mon Sep 17 00:00:00 2001 From: cpovirk Date: Sat, 21 Dec 2024 18:15:34 -0800 Subject: [PATCH] Remove dependency on JSR-305. (Or rather, demote it to a test-only dependency for `guava-testlib` only.) Fixes https://github.com/google/guava/issues/2960 This is the next step toward [using JSpecify in Guava](https://github.com/jspecify/jspecify/issues/239#issuecomment-2204318808). RELNOTES=n/a PiperOrigin-RevId: 708694414 --- android/guava-testlib/pom.xml | 2 + .../ElementTypesAreNonnullByDefault.java | 42 ------------------- .../ElementTypesAreNonnullByDefault.java | 42 ------------------- .../ElementTypesAreNonnullByDefault.java | 42 ------------------- .../ElementTypesAreNonnullByDefault.java | 42 ------------------- android/guava-tests/pom.xml | 4 -- .../AbstractFutureCancellationCauseTest.java | 2 +- .../guava/javadoc-link/jsr305/package-list | 3 -- android/guava/pom.xml | 9 ---- android/pom.xml | 6 --- guava-testlib/pom.xml | 2 + .../ElementTypesAreNonnullByDefault.java | 42 ------------------- .../ElementTypesAreNonnullByDefault.java | 42 ------------------- .../ElementTypesAreNonnullByDefault.java | 42 ------------------- .../ElementTypesAreNonnullByDefault.java | 42 ------------------- guava-tests/pom.xml | 4 -- .../AbstractFutureCancellationCauseTest.java | 2 +- guava/javadoc-link/jsr305/package-list | 3 -- guava/module.json | 28 ------------- guava/pom.xml | 9 ---- integration-tests/gradle/build.gradle.kts | 2 - pom.xml | 6 --- 22 files changed, 6 insertions(+), 412 deletions(-) delete mode 100644 android/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java delete mode 100644 android/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java delete mode 100644 android/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java delete mode 100644 android/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java delete mode 100644 android/guava/javadoc-link/jsr305/package-list delete mode 100644 guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java delete mode 100644 guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java delete mode 100644 guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java delete mode 100644 guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java delete mode 100644 guava/javadoc-link/jsr305/package-list diff --git a/android/guava-testlib/pom.xml b/android/guava-testlib/pom.xml index 0ea97ee3a89e..9d2dd827953b 100644 --- a/android/guava-testlib/pom.xml +++ b/android/guava-testlib/pom.xml @@ -21,6 +21,8 @@ com.google.code.findbugs jsr305 + 3.0.2 + test org.checkerframework diff --git a/android/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java b/android/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index 8db97d3f9f49..000000000000 --- a/android/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect.testing; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java b/android/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index 87df7be95abe..000000000000 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect.testing.google; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index c6a554f44d29..000000000000 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect.testing.testers; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/android/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java b/android/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index 7665c62b969e..000000000000 --- a/android/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.testing; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/android/guava-tests/pom.xml b/android/guava-tests/pom.xml index 58ee4d19732e..f409598c9d86 100644 --- a/android/guava-tests/pom.xml +++ b/android/guava-tests/pom.xml @@ -25,10 +25,6 @@ org.jspecify jspecify - - com.google.code.findbugs - jsr305 - org.checkerframework checker-qual diff --git a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java index a5eb4f792bff..48c4d41ac0de 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.lang.reflect.Method; import java.net.URLClassLoader; import java.util.HashMap; @@ -27,7 +28,6 @@ import java.util.concurrent.Executor; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.annotation.concurrent.GuardedBy; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; diff --git a/android/guava/javadoc-link/jsr305/package-list b/android/guava/javadoc-link/jsr305/package-list deleted file mode 100644 index cc08202c352c..000000000000 --- a/android/guava/javadoc-link/jsr305/package-list +++ /dev/null @@ -1,3 +0,0 @@ -javax.annotation -javax.annotation.concurrent -javax.annotation.meta diff --git a/android/guava/pom.xml b/android/guava/pom.xml index b0576e768671..0059215ad8ef 100644 --- a/android/guava/pom.xml +++ b/android/guava/pom.xml @@ -32,10 +32,6 @@ org.jspecify jspecify - - com.google.code.findbugs - jsr305 - org.checkerframework checker-qual @@ -161,11 +157,6 @@ false - - - https://static.javadoc.io/com.google.code.findbugs/jsr305/3.0.1/ - ${project.basedir}/javadoc-link/jsr305 - https://static.javadoc.io/com.google.j2objc/j2objc-annotations/1.1/ ${project.basedir}/javadoc-link/j2objc-annotations diff --git a/android/pom.xml b/android/pom.xml index e7f39ea7cc0c..22dcfb528361 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -22,7 +22,6 @@ %regex[.*.class] 1.4.4 1.0.0 - 3.0.2 3.43.0 2.36.0 3.0.0 @@ -423,11 +422,6 @@ jspecify ${jspecify.version} - - com.google.code.findbugs - jsr305 - ${jsr305.version} - org.checkerframework checker-qual diff --git a/guava-testlib/pom.xml b/guava-testlib/pom.xml index ddf8a4ae5795..2bb3c6fa7c04 100644 --- a/guava-testlib/pom.xml +++ b/guava-testlib/pom.xml @@ -21,6 +21,8 @@ com.google.code.findbugs jsr305 + 3.0.2 + test org.checkerframework diff --git a/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java b/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index 8db97d3f9f49..000000000000 --- a/guava-testlib/src/com/google/common/collect/testing/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect.testing; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java b/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index 87df7be95abe..000000000000 --- a/guava-testlib/src/com/google/common/collect/testing/google/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect.testing.google; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java b/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index c6a554f44d29..000000000000 --- a/guava-testlib/src/com/google/common/collect/testing/testers/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.collect.testing.testers; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java b/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java deleted file mode 100644 index 7665c62b969e..000000000000 --- a/guava-testlib/src/com/google/common/testing/ElementTypesAreNonnullByDefault.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.testing; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import com.google.common.annotations.GwtCompatible; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.annotation.Nonnull; -import javax.annotation.meta.TypeQualifierDefault; - -/** - * Marks all "top-level" types as non-null in a way that is recognized by Kotlin. Note that this - * unfortunately includes type-variable usages, so we also provide {@link ParametricNullness} to - * "undo" it as best we can. - */ -@GwtCompatible -@Retention(RUNTIME) -@Target({PACKAGE, TYPE}) -@TypeQualifierDefault({FIELD, METHOD, PARAMETER}) -@Nonnull -@interface ElementTypesAreNonnullByDefault {} diff --git a/guava-tests/pom.xml b/guava-tests/pom.xml index 6e320afcb9a5..7ec53f3782d0 100644 --- a/guava-tests/pom.xml +++ b/guava-tests/pom.xml @@ -25,10 +25,6 @@ org.jspecify jspecify - - com.google.code.findbugs - jsr305 - org.checkerframework checker-qual diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java index a5eb4f792bff..48c4d41ac0de 100644 --- a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureCancellationCauseTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.lang.reflect.Method; import java.net.URLClassLoader; import java.util.HashMap; @@ -27,7 +28,6 @@ import java.util.concurrent.Executor; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.annotation.concurrent.GuardedBy; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; diff --git a/guava/javadoc-link/jsr305/package-list b/guava/javadoc-link/jsr305/package-list deleted file mode 100644 index cc08202c352c..000000000000 --- a/guava/javadoc-link/jsr305/package-list +++ /dev/null @@ -1,3 +0,0 @@ -javax.annotation -javax.annotation.concurrent -javax.annotation.meta diff --git a/guava/module.json b/guava/module.json index 00bab28c2c0a..579b3576e860 100644 --- a/guava/module.json +++ b/guava/module.json @@ -47,13 +47,6 @@ "requires": "${jspecify.version}" } }, - { - "group": "com.google.code.findbugs", - "module": "jsr305", - "version": { - "requires": "${jsr305.version}" - } - }, { "group": "org.checkerframework", "module": "checker-qual", @@ -127,13 +120,6 @@ "requires": "${jspecify.version}" } }, - { - "group": "com.google.code.findbugs", - "module": "jsr305", - "version": { - "requires": "${jsr305.version}" - } - }, { "group": "org.checkerframework", "module": "checker-qual", @@ -207,13 +193,6 @@ "requires": "${jspecify.version}" } }, - { - "group": "com.google.code.findbugs", - "module": "jsr305", - "version": { - "requires": "${jsr305.version}" - } - }, { "group": "org.checkerframework", "module": "checker-qual", @@ -287,13 +266,6 @@ "requires": "${jspecify.version}" } }, - { - "group": "com.google.code.findbugs", - "module": "jsr305", - "version": { - "requires": "${jsr305.version}" - } - }, { "group": "org.checkerframework", "module": "checker-qual", diff --git a/guava/pom.xml b/guava/pom.xml index e6974e4dd3ea..be6fcc1ad1fc 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -32,10 +32,6 @@ org.jspecify jspecify - - com.google.code.findbugs - jsr305 - org.checkerframework checker-qual @@ -161,11 +157,6 @@ false - - - https://static.javadoc.io/com.google.code.findbugs/jsr305/3.0.1/ - ${project.basedir}/javadoc-link/jsr305 - https://static.javadoc.io/com.google.j2objc/j2objc-annotations/1.1/ ${project.basedir}/javadoc-link/j2objc-annotations diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index 41334e18c62a..f2bac8ac223e 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -10,7 +10,6 @@ val expectedReducedRuntimeClasspathAndroidVersion = "failureaccess-1.0.2.jar", "j2objc-annotations-3.0.0.jar", "jspecify-1.0.0.jar", - "jsr305-3.0.2.jar", "checker-qual-3.43.0.jar", "error_prone_annotations-2.36.0.jar", "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" @@ -21,7 +20,6 @@ val expectedReducedRuntimeClasspathJreVersion = "failureaccess-1.0.2.jar", "j2objc-annotations-3.0.0.jar", "jspecify-1.0.0.jar", - "jsr305-3.0.2.jar", "checker-qual-3.43.0.jar", "error_prone_annotations-2.36.0.jar", "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" diff --git a/pom.xml b/pom.xml index 237c08bdb8cd..3a2a9eee8abf 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,6 @@ %regex[.*.class] 1.4.4 1.0.0 - 3.0.2 3.43.0 2.36.0 3.0.0 @@ -418,11 +417,6 @@ jspecify ${jspecify.version} - - com.google.code.findbugs - jsr305 - ${jsr305.version} - org.checkerframework checker-qual