Merge remote-tracking branch 'refs/remotes/origin/main' into introduc…

…e-version-catalog

Apply new versions from versions.prop to version catalog.

# Conflicts:
#	versions.lock
#	versions.props

.github/workflows/bin-solr-test.yml

@@ -9,6 +9,7 @@ on:
       - '.github/workflows/bin-solr-test.yml'
       - 'solr/bin/**'
       - 'solr/packaging/**'
+      - 'solr/core/src/java/org/apache/solr/cli/**'
 
 jobs:
   test:

gradle/libs.versions.toml

@@ -24,25 +24,25 @@ minJava = "11"
 gradle = "8.4"
 
 adobe-testing-s3mock = "2.17.0"
-amazon-awssdk = "2.20.155"
+amazon-awssdk = "2.26.19"
 antora = "3.1.4"
 # Most recent commit as of 2022-06-24, this repo does not have tags
 antora-default-ui = "51ad811622394027afb4e182c2fdabc235ae04dd"
 antora-lunr-extension = "1.0.0-alpha.8"
-apache-calcite = "1.35.0"
-apache-calcite-avatica = "1.23.0"
+apache-calcite = "1.37.0"
+apache-calcite-avatica = "1.25.0"
 apache-commons-collections4 = "4.4"
 apache-commons-compress = "1.26.1"
-apache-commons-configuration2 = "2.10.1"
+apache-commons-configuration2 = "2.11.0"
 apache-commons-exec = "1.4.0"
-apache-commons-lang3 = "3.14.0"
+apache-commons-lang3 = "3.15.0"
 apache-commons-math3 = "3.6.1"
 apache-curator = "5.7.0"
 apache-httpcomponents-httpmime = "4.5.14"
 apache-httpcomponents-httpclient = "4.5.14"
 apache-httpcomponents-httpcore = "4.4.16"
 apache-hadoop = "3.3.6"
-apache-hadoop-thirdparty = "1.1.1"
+apache-hadoop-thirdparty = "1.2.0"
 apache-kerby = "1.0.1"
 apache-log4j = "2.21.0"
 apache-lucene = "9.11.1"
@@ -58,21 +58,21 @@ asciidoctor-mathjax = "0.0.9"
 asciidoctor-tabs = "1.0.0-beta.6"
 bc-jose4j = "0.9.6"
 benmanes-caffeine = "3.1.8"
-bouncycastle = "1.77"
+bouncycastle = "1.78.1"
 browserify = "17.0.0"
 carrot2-core = "4.5.1"
 carrotsearch-dependencychecks = "0.0.9"
-carrotsearch-hppc = "0.9.1"
+carrotsearch-hppc = "0.10.0"
 carrotsearch-randomizedtesting = "2.8.1"
 codehaus-woodstox = "4.2.2"
 commons-cli = "1.8.0"
-commons-codec = "1.17.0"
+commons-codec = "1.17.1"
 commons-collections = "3.2.2"
 commons-io = "2.15.1"
 cybozulabs-langdetect = "1.1-20120112"
 cutterslade-analyze = "1.9.1"
 diffplug-spotless = "6.5.2"
-dropwizard-metrics = "4.2.25"
+dropwizard-metrics = "4.2.26"
 eclipse-ecj = "3.33.0"
 eclipse-jetty = "10.0.22"
 eclipse-jgit = "6.7.0.202309050840-r"
@@ -82,7 +82,7 @@ fasterxml-woodstox = "6.6.2"
 flexmark = "0.64.8"
 google-api-gax = "2.33.0"
 google-auth = "1.19.0"
-google-cloud-bom = "0.204.0"
+google-cloud-bom = "0.224.0"
 google-cloud-core = "2.23.0"
 google-cloud-nio = "0.127.3"
 google-cloud-storage = "2.27.0"
@@ -91,7 +91,7 @@ google-guava = "32.1.3-jre"
 # @keep This is GJF version for spotless/ tidy.
 google-javaformat = "1.18.1"
 google-re2j = "1.7"
-grpc = "1.61.1"
+grpc = "1.65.1"
 gulp-cli = "2.3.0"
 hamcrest = "2.2"
 hk2 = "3.0.5"
@@ -104,7 +104,7 @@ jakarta-inject = "2.0.1"
 jakarta-ws = "3.1.0"
 javacc = "7.0.12"
 jayway-jsonpath = "2.9.0"
-jctools = "4.0.1"
+jctools = "4.0.5"
 jersey = "3.1.5"
 jersey-containers = "2.39.1"
 johnrengelman-shadow = "6.1.0"
@@ -119,7 +119,7 @@ netty = "4.1.111.Final"
 nimbusds-josejwt = "9.30.2"
 nodegradle-node = "7.0.1"
 openapi = "7.6.0"
-opentelemetry = "1.35.0"
+opentelemetry = "1.40.0"
 osgi-annotation = "8.1.0"
 owasp-dependencycheck = "9.0.8"
 palantir-consistentversions = "2.16.0"

gradle/testing/randomization/policies/solr-tests.policy

@@ -146,6 +146,7 @@ grant {
 
   // Needed by JWT integration tests & S3 tests
   permission java.lang.RuntimePermission "setFactory";
+  permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default";
 
   permission javax.xml.bind.JAXBPermission "setDatatypeConverter";
 

solr/CHANGES.txt

@@ -122,6 +122,8 @@ New Features
   overridden with a property ('solr.query.minPrefixLength').  Users may also override their collection-wide setting for individual queries by providing a
   `minPrefixQueryTermLength` local-param.  (Jason Gerlowski, David Smiley)
 
+* SOLR-10255: Add support for docValues to solr.BinaryField. (Alexey Serba via Mikhail Khludnev, David Smiley)
+
 Improvements
 ---------------------
 * SOLR-17137: Enable Prometheus exporter to communicate with SSL protected Solr. (Eivind Bergstøl via Eric Pugh)
@@ -154,6 +156,10 @@ Improvements
   Statuses are now removed 5 minutes after the read of a completed/failed status.  Helps collection
   async backup/restore and other operations scale to 100+ shards.  (Pierre Salagnac, David Smiley)
 
+* SOLR-10808 : The Solr schema version has been increased to 1.7. Since schema version 1.7, all fields/fieldTypes that
+  support docValues will have them enabled by default. This behavior can be reverted by setting
+  'docValues' parameter for a field or a field type to false, the default for schema versions 1.6 and below. (Houston Putman)
+
 Optimizations
 ---------------------
 * SOLR-17257: Both Minimize Cores and the Affinity replica placement strategies would over-gather
@@ -171,6 +177,8 @@ Optimizations
 
 * SOLR-17349: SolrDocumentFetcher should always skip lazy field loading overhead if documentCache==null (Michael Gibney)
 
+* SOLR-17340: Add cache on top of system metrics BeanInfos to make calls to /admin/info/system faster (Pierre Salagnac)
+
 Bug Fixes
 ---------------------
 * SOLR-12813: subqueries should respect basic auth. (Rudy Seitz via Eric Pugh)
@@ -200,6 +208,10 @@ Bug Fixes
 
 * SOLR-17333: Rate-limiting feature: fix live-update of config (Michael Gibney)
 
+* SOLR-17367: Restore the use of -params option to PostTool. (Bostoi via Eric Pugh)
+
+* SOLR-17369: Fix "flags" usage in FunctionQParser that caused some issues in vectorSimilarity() with BYTE vector constants (hossman)
+
 Dependency Upgrades
 ---------------------
 (No changes)
@@ -226,6 +238,8 @@ Other Changes
 * SOLR-17347: EnvUtils: Removed "env" methods, as they were problematic.  Code should almost never
   refer to env vars.  (David Smiley)
 
+* SOLR-15831: Refactor bin/solr and bin/solr.cmd commands integration with AuthTool, DeleteTool, and PackageTool to delegate arg parsing to Java code.  Removed limitation of PackageTool only being executed on an active Solr node.  (Eric Pugh)
+
 ==================  9.6.1 ==================
 Bug Fixes
 ---------------------

solr/benchmark/src/resources/configs/cloud-minimal/conf/schema.xml

@@ -15,9 +15,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
     <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
-    <fieldType name="string" class="solr.StrField" docValues="true"/>
+    <fieldType name="string" class="solr.StrField"/>
     <fieldType name="int" class="org.apache.solr.schema.IntPointField" docValues="false" omitNorms="true"
                positionIncrementGap="0"/>
     <fieldType name="long" class="org.apache.solr.schema.LongPointField" docValues="false" omitNorms="true"

solr/benchmark/src/resources/configs/minimal/conf/schema.xml

@@ -15,7 +15,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<schema name="minimal" version="1.1">
+<schema name="minimal" version="1.7">
   <fieldType name="string" class="solr.StrField"/>
   <dynamicField name="*" type="string" indexed="true" stored="true"/>
 </schema>