Skip to content

Commit eb5648d

Browse files
authored
chore: declare jspecify in jar parent and ignore if unused (#13704)
Declare org.jspecify:jspecify as a dependency in google-cloud-jar-parent so that all client libraries inherit it, resolving "used undeclared dependency" issues caused by the new JSpecify changes. Also add org.jspecify:jspecify to ignoredUnusedDeclaredDependencies in java-shared-config to prevent "unused declared dependency" warnings/failures in modules that do not use it yet (e.g. gRPC modules)
1 parent 1951f49 commit eb5648d

10 files changed

Lines changed: 16 additions & 0 deletions

File tree

google-cloud-jar-parent/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@
148148
</dependencies>
149149
</dependencyManagement>
150150

151+
<dependencies>
152+
<dependency>
153+
<groupId>org.jspecify</groupId>
154+
<artifactId>jspecify</artifactId>
155+
</dependency>
156+
</dependencies>
157+
151158
<profiles>
152159
<profile>
153160
<id>java9</id>

java-bigquery/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
<!-- maven-dependency-plugin cannot detect the runtime usage of junit-platform-suite-engine for executing JUnit 5+ test suites. -->
136136
<ignoredUnusedDeclaredDependency>org.junit.platform:junit-platform-suite-engine</ignoredUnusedDeclaredDependency>
137137
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
138+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
138139
</ignoredUnusedDeclaredDependencies>
139140
</configuration>
140141
</plugin>

java-bigquerystorage/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
<ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
174174
<!-- maven-dependency-plugin cannot detect the runtime usage of junit-vintage-engine for executing JUnit 4.x tests. -->
175175
<ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine</ignoredUnusedDeclaredDependency>
176+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
176177
</ignoredUnusedDeclaredDependencies>
177178
</configuration>
178179
</plugin>

java-datastore/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
<ignoredUnusedDeclaredDependency>com.google.http-client:google-http-client-jackson2</ignoredUnusedDeclaredDependency>
215215
<ignoredUnusedDeclaredDependency>com.google.oauth-client:google-oauth-client</ignoredUnusedDeclaredDependency>
216216
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
217+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
217218
</ignoredUnusedDeclaredDependencies>
218219
</configuration>
219220
</plugin>

java-logging/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<ignoredUnusedDeclaredDependencies>
9090
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
9191
<ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
92+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
9293
</ignoredUnusedDeclaredDependencies>
9394
</configuration>
9495
</plugin>

java-pubsub/google-cloud-pubsub/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
<ignoredUnusedDeclaredDependency>io.opencensus:opencensus-impl</ignoredUnusedDeclaredDependency>
204204
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
205205
<ignoredUnusedDeclaredDependency>org.assertj:assertj-core</ignoredUnusedDeclaredDependency>
206+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
206207
</ignoredUnusedDeclaredDependencies>
207208
</configuration>
208209
</plugin>

java-pubsub/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
<ignoredUnusedDeclaredDependencies>
128128
<ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
129129
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
130+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
130131
</ignoredUnusedDeclaredDependencies>
131132
</configuration>
132133
</plugin>

java-shared-config/java-shared-config/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
<configuration>
146146
<ignoredUnusedDeclaredDependencies>
147147
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
148+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
148149
</ignoredUnusedDeclaredDependencies>
149150
<!-- TODO: Try to remove these exclusions by updating handwritten libs -->
150151
<ignoredNonTestScopedDependencies>

java-spanner-jdbc/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@
373373
<ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
374374
<ignoredDependency>io.opentelemetry:*</ignoredDependency>
375375
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
376+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
376377
</ignoredUnusedDeclaredDependencies>
377378
<ignoredNonTestScopedDependencies>
378379
<ignoredDependency>io.opentelemetry:*</ignoredDependency>

java-storage-nio/google-cloud-nio/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
<!-- This dependency is used for its native image configuration in the test scope -->
190190
<ignoredUnusedDeclaredDependency>com.google.api:gax:jar</ignoredUnusedDeclaredDependency>
191191
<ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
192+
<ignoredUnusedDeclaredDependency>org.jspecify:jspecify</ignoredUnusedDeclaredDependency>
192193
</ignoredUnusedDeclaredDependencies>
193194
</configuration>
194195
</plugin>

0 commit comments

Comments
 (0)