Skip to content

Commit 1f7dd6d

Browse files
authored
Forbiddenapis: Split the guava16-only signatures file from main signatures file (#12170)
1 parent cacfcfc commit 1f7dd6d

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

codestyle/druid-forbidden-apis.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ com.google.common.collect.Sets#newLinkedHashSet() @ Create java.util.LinkedHashS
2121
com.google.common.collect.Sets#newTreeSet() @ Create java.util.TreeSet directly
2222
com.google.common.collect.Sets#newTreeSet(java.util.Comparator) @ Create java.util.TreeSet directly
2323
com.google.common.io.Files#createTempDir() @ Use org.apache.druid.java.util.common.FileUtils.createTempDir()
24-
com.google.common.util.concurrent.MoreExecutors#sameThreadExecutor() @ Use org.apache.druid.java.util.common.concurrent.Execs#directExecutor()
2524
java.io.File#mkdirs() @ Use org.apache.druid.java.util.common.FileUtils.mkdirp instead
2625
java.io.File#toURL() @ Use java.io.File#toURI() and java.net.URI#toURL() instead
2726
java.lang.String#matches(java.lang.String) @ Use startsWith(), endsWith(), contains(), or compile and cache a Pattern explicitly
@@ -46,7 +45,6 @@ org.apache.commons.io.FileUtils#getTempDirectory() @ Use org.junit.rules.Tempora
4645
org.apache.commons.io.FileUtils#deleteDirectory(java.io.File) @ Use org.apache.druid.java.util.common.FileUtils#deleteDirectory()
4746
org.apache.commons.io.FileUtils#forceMkdir(java.io.File) @ Use org.apache.druid.java.util.common.FileUtils.mkdirp instead
4847
java.lang.Class#getCanonicalName() @ Class.getCanonicalName can return null for anonymous types, use Class.getName instead.
49-
com.google.common.base.Objects#firstNonNull(java.lang.Object, java.lang.Object) @ Use org.apache.druid.common.guava.GuavaUtils#firstNonNull(java.lang.Object, java.lang.Object) instead (probably... the GuavaUtils method return object is nullable)
5048

5149
@defaultMessage Use Locale.ENGLISH
5250
com.ibm.icu.text.DateFormatSymbols#<init>()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Those signatures are only available in Guava 16:
2+
com.google.common.util.concurrent.MoreExecutors#sameThreadExecutor() @ Use org.apache.druid.java.util.common.concurrent.Execs#directExecutor()
3+
com.google.common.base.Objects#firstNonNull(java.lang.Object, java.lang.Object) @ Use org.apache.druid.common.guava.GuavaUtils#firstNonNull(java.lang.Object, java.lang.Object) instead (probably... the GuavaUtils method return object is nullable)

extensions-contrib/opentelemetry-emitter/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,16 @@
212212
</execution>
213213
</executions>
214214
</plugin>
215+
<plugin>
216+
<groupId>de.thetaphi</groupId>
217+
<artifactId>forbiddenapis</artifactId>
218+
<configuration>
219+
<signaturesFiles>
220+
<signaturesFile>${project.parent.basedir}/codestyle/joda-time-forbidden-apis.txt</signaturesFile>
221+
<signaturesFile>${project.parent.basedir}/codestyle/druid-forbidden-apis.txt</signaturesFile>
222+
</signaturesFiles>
223+
</configuration>
224+
</plugin>
215225
</plugins>
216226
</build>
217227
</project>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,9 +1297,8 @@
12971297
<plugin>
12981298
<groupId>de.thetaphi</groupId>
12991299
<artifactId>forbiddenapis</artifactId>
1300-
<version>3.1</version>
1300+
<version>3.2</version>
13011301
<configuration>
1302-
<failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
13031302
<ignoreSignaturesOfMissingClasses>true</ignoreSignaturesOfMissingClasses>
13041303
<bundledSignatures>
13051304
<!--
@@ -1310,6 +1309,7 @@
13101309
</bundledSignatures>
13111310
<signaturesFiles>
13121311
<signaturesFile>${project.parent.basedir}/codestyle/joda-time-forbidden-apis.txt</signaturesFile>
1312+
<signaturesFile>${project.parent.basedir}/codestyle/guava16-forbidden-apis.txt</signaturesFile>
13131313
<signaturesFile>${project.parent.basedir}/codestyle/druid-forbidden-apis.txt</signaturesFile>
13141314
</signaturesFiles>
13151315
<excludes>

0 commit comments

Comments
 (0)