Apache Solr open-source search software
SOLR-17321: Update ecj compiler versions to JDK 17 (#2804)
Christos Malliaridis6561135f0b42
diff --git a/build-tools/scriptDepVersions.gradle b/build-tools/scriptDepVersions.gradleindex 25413b6791a..329905331a9 100644--- a/build-tools/scriptDepVersions.gradle+++ b/build-tools/scriptDepVersions.gradle@@ -25,7 +25,7 @@ ext {"min-solrj-java-version" : "17","apache-rat": "0.15","commons-codec": "1.16.0",- "ecj": "3.36.0",+ "ecj": "3.39.0","javacc": "7.0.12","jgit": "6.7.0.202309050840-r","flexmark": "0.64.8",diff --git a/gradle/validation/ecj-lint/ecj.javadocs.prefs b/gradle/validation/ecj-lint/ecj.javadocs.prefsindex 975707055ff..74278547699 100644--- a/gradle/validation/ecj-lint/ecj.javadocs.prefs+++ b/gradle/validation/ecj-lint/ecj.javadocs.prefs@@ -5,8 +5,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotaorg.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabledorg.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullableorg.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11-org.eclipse.jdt.core.compiler.compliance=11+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17+org.eclipse.jdt.core.compiler.compliance=17org.eclipse.jdt.core.compiler.doc.comment.support=enabledorg.eclipse.jdt.core.compiler.problem.annotationSuperInterface=errororg.eclipse.jdt.core.compiler.problem.assertIdentifier=error@@ -93,4 +93,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disaorg.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignoreorg.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignoreorg.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error-org.eclipse.jdt.core.compiler.source=11+org.eclipse.jdt.core.compiler.source=17diff --git a/solr/solrj/src/java/org/apache/solr/common/util/FastJavaBinDecoder.java b/solr/solrj/src/java/org/apache/solr/common/util/FastJavaBinDecoder.javaindex 06be49fc8de..37d82822cad 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/FastJavaBinDecoder.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/FastJavaBinDecoder.java@@ -44,7 +44,6 @@ import static org.apache.solr.common.util.JavaBinCodec.SLONG;import static org.apache.solr.common.util.JavaBinCodec.SOLRDOC;import static org.apache.solr.common.util.JavaBinCodec.SOLRDOCLST;import static org.apache.solr.common.util.JavaBinCodec.SOLRINPUTDOC;-import static org.apache.solr.common.util.JavaBinCodec.STR;import static org.apache.solr.common.util.JavaBinCodec.TAG_AND_LEN;import static org.apache.solr.common.util.JavaBinCodec.readVInt;@@ -586,7 +585,7 @@ public class FastJavaBinDecoder implements DataEntry.FastDecoder {},// types that combine tag + length (or other info) in a single byte_TAG_AND_LEN(TAG_AND_LEN, UPPER_3_BITS, null),- _STR(STR, UPPER_3_BITS, DataEntry.Type.STR) {+ _STR(JavaBinCodec.STR, UPPER_3_BITS, DataEntry.Type.STR) {@Overridepublic void lazyRead(EntryImpl entry, StreamCodec codec) throws IOException {entry.size = readObjSz(codec, this);