Apache Lucene open-source search software
Upgrade to forbiddenapis 3.3 (#768)
Uwe Schindlerff263f0aa417
diff --git a/build.gradle b/build.gradleindex 5162a72fd8a..cfde2a0204b 100644--- a/build.gradle+++ b/build.gradle@@ -22,7 +22,7 @@ plugins {id "base"id "com.palantir.consistent-versions" version "2.0.0"id "org.owasp.dependencycheck" version "5.3.0"- id 'de.thetaphi.forbiddenapis' version '3.2' apply false+ id 'de.thetaphi.forbiddenapis' version '3.3' apply falseid "de.undercouch.download" version "4.1.1" apply falseid "net.ltgt.errorprone" version "2.0.2" apply falseid 'com.diffplug.spotless' version "5.14.3" apply falsediff --git a/gradle/validation/forbidden-apis/com.google.guava.guava.all.txt b/gradle/validation/forbidden-apis/com.google.guava.guava.all.txtdeleted file mode 100644index 4e04e789415..00000000000--- a/gradle/validation/forbidden-apis/com.google.guava.guava.all.txt+++ /dev/null@@ -1,17 +0,0 @@-@defaultMessage Use corresponding Java 8 functional/streaming interfaces-com.google.common.base.Function-com.google.common.base.Joiner-com.google.common.base.Predicate-com.google.common.base.Supplier--@defaultMessage Use java.nio.charset.StandardCharsets instead-com.google.common.base.Charsets--@defaultMessage Use methods in java.util.Objects instead-com.google.common.base.Objects#equal(java.lang.Object,java.lang.Object)-com.google.common.base.Objects#hashCode(java.lang.Object[])-com.google.common.base.Preconditions#checkNotNull(java.lang.Object)-com.google.common.base.Preconditions#checkNotNull(java.lang.Object,java.lang.Object)--@defaultMessage Use methods in java.util.Comparator instead-com.google.common.collect.Orderingdiff --git a/gradle/validation/forbidden-apis/commons-codec.commons-codec.all.txt b/gradle/validation/forbidden-apis/commons-codec.commons-codec.all.txtindex c73505398be..799ed5c3df6 100644--- a/gradle/validation/forbidden-apis/commons-codec.commons-codec.all.txt+++ b/gradle/validation/forbidden-apis/commons-codec.commons-codec.all.txt@@ -1,5 +1,2 @@-@defaultMessage Use java.nio.charset.StandardCharsets instead-org.apache.commons.codec.Charsets--@defaultMessage Use java.util.Base64 instead-org.apache.commons.codec.binary.Base64\ No newline at end of file+org.apache.commons.codec.Charsets @ Use java.nio.charset.StandardCharsets instead+org.apache.commons.codec.binary.Base64 @ Use java.util.Base64 insteaddiff --git a/gradle/validation/forbidden-apis/defaults.all.txt b/gradle/validation/forbidden-apis/defaults.all.txtindex 6c6e0296cc5..0265a7f2a89 100644--- a/gradle/validation/forbidden-apis/defaults.all.txt+++ b/gradle/validation/forbidden-apis/defaults.all.txt@@ -42,22 +42,14 @@ java.util.Locale#forLanguageTag(java.lang.String) @ use new Locale.Builder().setjava.util.Locale#toString() @ use Locale#toLanguageTag() for a standardized BCP47 locale name@defaultMessage Constructors for wrapper classes of Java primitives should be avoided in favor of the public static methods available or autoboxing-java.lang.Integer#<init>(int)-java.lang.Integer#<init>(java.lang.String)-java.lang.Byte#<init>(byte)-java.lang.Byte#<init>(java.lang.String)-java.lang.Short#<init>(short)-java.lang.Short#<init>(java.lang.String)-java.lang.Long#<init>(long)-java.lang.Long#<init>(java.lang.String)-java.lang.Boolean#<init>(boolean)-java.lang.Boolean#<init>(java.lang.String)-java.lang.Character#<init>(char)-java.lang.Float#<init>(float)-java.lang.Float#<init>(double)-java.lang.Float#<init>(java.lang.String)-java.lang.Double#<init>(double)-java.lang.Double#<init>(java.lang.String)+java.lang.Integer#<init>(**)+java.lang.Byte#<init>(**)+java.lang.Short#<init>(**)+java.lang.Long#<init>(**)+java.lang.Boolean#<init>(**)+java.lang.Character#<init>(**)+java.lang.Float#<init>(**)+java.lang.Double#<init>(**)@defaultMessage Java deserialization is unsafe when the data is untrusted. The java developer is powerless: no checks or casts help, exploitation can happen in places such as clinit or finalize!java.io.ObjectInputStreamdiff --git a/gradle/validation/forbidden-apis/defaults.logging.txt b/gradle/validation/forbidden-apis/defaults.logging.txtindex 742d6274583..a510df57800 100644--- a/gradle/validation/forbidden-apis/defaults.logging.txt+++ b/gradle/validation/forbidden-apis/defaults.logging.txt@@ -19,20 +19,11 @@ java.util.logging.Level#FINEjava.util.logging.Level#FINERjava.util.logging.Level#FINESTjava.util.logging.Level#INFO-# TODO: Replace with the new forbiddenapis 3.3 wildcard method signatures: https://github.com/policeman-tools/forbidden-apis/pull/188-java.util.logging.Logger#config(java.lang.String)-java.util.logging.Logger#config(java.util.function.Supplier)-java.util.logging.Logger#fine(java.lang.String)-java.util.logging.Logger#fine(java.util.function.Supplier)-java.util.logging.Logger#finer(java.lang.String)-java.util.logging.Logger#finer(java.util.function.Supplier)-java.util.logging.Logger#finest(java.lang.String)-java.util.logging.Logger#finest(java.util.function.Supplier)-java.util.logging.Logger#info(java.lang.String)-java.util.logging.Logger#info(java.util.function.Supplier)-java.util.logging.Logger#throwing(java.lang.String,java.lang.String,java.lang.Throwable)-java.util.logging.Logger#entering(java.lang.String,java.lang.String)-java.util.logging.Logger#entering(java.lang.String,java.lang.String,java.lang.Object)-java.util.logging.Logger#entering(java.lang.String,java.lang.String,java.lang.Object[])-java.util.logging.Logger#exiting(java.lang.String,java.lang.String)-java.util.logging.Logger#exiting(java.lang.String,java.lang.String,java.lang.Object)+java.util.logging.Logger#config(**)+java.util.logging.Logger#fine(**)+java.util.logging.Logger#finer(**)+java.util.logging.Logger#finest(**)+java.util.logging.Logger#info(**)+java.util.logging.Logger#throwing(**)+java.util.logging.Logger#entering(**)+java.util.logging.Logger#exiting(**)diff --git a/gradle/validation/forbidden-apis/defaults.lucene.txt b/gradle/validation/forbidden-apis/defaults.lucene.txtindex 6a41e5a973d..f3b7972a40d 100644--- a/gradle/validation/forbidden-apis/defaults.lucene.txt+++ b/gradle/validation/forbidden-apis/defaults.lucene.txt@@ -25,26 +25,5 @@ java.nio.file.Path#toFile()java.util.jar.JarFilejava.util.zip.ZipFile-@defaultMessage Prefer using ArrayUtil as Arrays#copyOfRange fills zeros for bad bounds-java.util.Arrays#copyOfRange(byte[],int,int)-java.util.Arrays#copyOfRange(char[],int,int)-java.util.Arrays#copyOfRange(short[],int,int)-java.util.Arrays#copyOfRange(int[],int,int)-java.util.Arrays#copyOfRange(long[],int,int)-java.util.Arrays#copyOfRange(float[],int,int)-java.util.Arrays#copyOfRange(double[],int,int)-java.util.Arrays#copyOfRange(boolean[],int,int)-java.util.Arrays#copyOfRange(java.lang.Object[],int,int)-java.util.Arrays#copyOfRange(java.lang.Object[],int,int,java.lang.Class)--@defaultMessage Prefer using ArrayUtil as Arrays#copyOf fills zeros for bad bounds-java.util.Arrays#copyOf(byte[],int)-java.util.Arrays#copyOf(char[],int)-java.util.Arrays#copyOf(short[],int)-java.util.Arrays#copyOf(int[],int)-java.util.Arrays#copyOf(long[],int)-java.util.Arrays#copyOf(float[],int)-java.util.Arrays#copyOf(double[],int)-java.util.Arrays#copyOf(boolean[],int)-java.util.Arrays#copyOf(java.lang.Object[],int)-java.util.Arrays#copyOf(java.lang.Object[],int,java.lang.Class)+java.util.Arrays#copyOfRange(**) @ Prefer using ArrayUtil as Arrays#copyOfRange fills zeros for bad bounds+java.util.Arrays#copyOf(**) @ Prefer using ArrayUtil as Arrays#copyOf fills zeros for bad boundsdiff --git a/gradle/validation/forbidden-apis/defaults.tests.txt b/gradle/validation/forbidden-apis/defaults.tests.txtindex 02ab6c8dfd9..3eb9de50b79 100644--- a/gradle/validation/forbidden-apis/defaults.tests.txt+++ b/gradle/validation/forbidden-apis/defaults.tests.txt@@ -20,6 +20,4 @@ java.lang.Math#random() @ Use RandomizedRunner's random().nextDouble() instead#java.lang.System#currentTimeMillis() @ Don't depend on wall clock times#java.lang.System#nanoTime() @ Don't depend on wall clock times-@defaultMessage Use LuceneTestCase.collate instead, which can avoid JDK-8071862-java.text.Collator#compare(java.lang.Object,java.lang.Object)-java.text.Collator#compare(java.lang.String,java.lang.String)+java.text.Collator#compare(**) @ Use LuceneTestCase.collate instead, which can avoid JDK-8071862diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex cda9ad881cc..bbdc8c47662 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -88,6 +88,11 @@ Bug Fixes* LUCENE-10477: Highlighter: WeightedSpanTermExtractor.extractWeightedSpanTerms to Query#rewritemultiple times if necessary. (Christine Poerschke, Adrien Grand)+Build+---------------------++* Upgrade forbiddenapis to version 3.3. (Uwe Schindler)+Other---------------------(No changes)