Skip to content

Commit 4657709

Browse files
committed
Upgrade dependencies
Guava was used by a single checkNotNull() call site, so the dependency was removed instead of upgraded.
1 parent b51f5ab commit 4657709

File tree

2 files changed

+15
-24
lines changed

2 files changed

+15
-24
lines changed

pom.xml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<maven.compiler.source>1.8</maven.compiler.source>
3838
<maven.compiler.target>1.8</maven.compiler.target>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<errorprone.version>2.4.0</errorprone.version>
40+
<errorprone.version>2.10.0</errorprone.version>
4141
<javac.version>9+181-r4173-1</javac.version>
4242
</properties>
4343

@@ -64,28 +64,22 @@
6464
</developers>
6565

6666
<dependencies>
67-
<dependency>
68-
<groupId>com.google.errorprone</groupId>
69-
<artifactId>error_prone_core</artifactId>
70-
<version>${errorprone.version}</version>
71-
<scope>provided</scope>
72-
</dependency>
7367
<dependency>
7468
<groupId>com.google.auto.service</groupId>
7569
<artifactId>auto-service</artifactId>
76-
<version>1.0-rc7</version>
70+
<version>1.1.1</version>
7771
<optional>true</optional>
7872
</dependency>
7973
<dependency>
80-
<groupId>com.google.guava</groupId>
81-
<artifactId>guava</artifactId>
82-
<version>27.1-jre</version>
83-
<optional>true</optional>
74+
<groupId>com.google.errorprone</groupId>
75+
<artifactId>error_prone_core</artifactId>
76+
<version>${errorprone.version}</version>
77+
<scope>provided</scope>
8478
</dependency>
8579
<dependency>
8680
<groupId>junit</groupId>
8781
<artifactId>junit</artifactId>
88-
<version>4.13.1</version>
82+
<version>4.13.2</version>
8983
<scope>test</scope>
9084
</dependency>
9185
<dependency>
@@ -95,16 +89,11 @@
9589
<scope>test</scope>
9690
</dependency>
9791

98-
<!-- force version of transitive dependencies to avoid requireUpperBoundDeps violation -->
99-
<dependency>
100-
<groupId>com.google.code.findbugs</groupId>
101-
<artifactId>jsr305</artifactId>
102-
<version>3.0.2</version>
103-
</dependency>
92+
<!-- upgrade version of transitive dependencies to avoid requireUpperBoundDeps violation -->
10493
<dependency>
105-
<groupId>org.checkerframework</groupId>
106-
<artifactId>checker-qual</artifactId>
107-
<version>2.10.0</version>
94+
<groupId>com.google.auto.value</groupId>
95+
<artifactId>auto-value-annotations</artifactId>
96+
<version>1.7.4</version>
10897
</dependency>
10998
</dependencies>
11099

src/main/java/io/grpc/annotations/checkers/AnnotationChecker.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.grpc.annotations.checkers;
1818

19-
import static com.google.common.base.Preconditions.checkNotNull;
2019
import static com.google.errorprone.matchers.Description.NO_MATCH;
2120

2221
import com.google.errorprone.VisitorState;
@@ -48,7 +47,10 @@ abstract class AnnotationChecker extends BugChecker implements IdentifierTreeMat
4847
}
4948

5049
AnnotationChecker(String annotationType, boolean requireAnnotationOnMethodHierarchy) {
51-
this.annotationType = checkNotNull(annotationType, "annotationType");
50+
if (annotationType == null) {
51+
throw new NullPointerException("annotationType");
52+
}
53+
this.annotationType = annotationType;
5254
this.requireAnnotationOnMethodHierarchy = requireAnnotationOnMethodHierarchy;
5355
}
5456

0 commit comments

Comments
 (0)