Merge branch 'main' into jira/solr-17112

* main: (27 commits)
  Update protected-branches to include branch_9_5 (apache#2211)
  SOLR-16397: Tweak v2 'REQUESTSTATUS' API to be more REST-ful  (apache#2144)
  SOLR-17120: handle null value when merging partials (apache#2214)
  SOLR-17119: Fix exception swallowing in /cluster/plugins (apache#2202)
  SOLR-15960 Cut over System.getProperty() to EnvUtils for modules (apache#2193)
  Final fix for node problems (apache#2208)
  SOLR-16397: Fix warning in merge-indices docs
  Fix nodeSetup, use node distBaseUrl instead of registry (apache#2208)
  Add next minor version 9.6.0
  SOLR-17089: Upgrade Jersey to 3.1.5 (apache#2178)
  solr-ref-guide: fix typo in result-clustering.adoc (apache#2210)
  SOLR-17074: Fixed not correctly escaped quote in bin/solr script (apache#2200)
  SOLR-15960: Rename getProp as getProperty (apache#2194)
  Add npmRegistry for nodeSetup as well (apache#2208)
  Give NPM registry option for downloading node tools (apache#2208)
  SOLR-17116: Fix INSTALLSHARDDATA async reporting (apache#2188)
  SOLR-17066: Replace 'data store' term in code and docs (apache#2201)
  SOLR-17121: Fix SchemaCodecFactory to get PostingsFormat and DocValues from field. (apache#2206)
  Sync CHANGES for 9.4.1
  Add bugfix version 9.4.1
  ...

.asf.yaml

@@ -1,4 +1,4 @@
-# https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
+# https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
 
 github:
   description: "Apache Solr open-source search software"
@@ -26,6 +26,7 @@ github:
     branch_9_2: {}
     branch_9_3: {}
     branch_9_4: {}
+    branch_9_5: {}
     branch_9x: {}
 
   protected_tags:

dev-tools/doap/solr.rdf

@@ -68,6 +68,13 @@
     </maintainer>
 
     <!-- NOTE: please insert releases in numeric order, NOT chronologically. -->
+    <release>
+         <Version>
+           <name>solr-9.4.1</name>
+           <created>2024-01-18</created>
+           <revision>9.4.1</revision>
+         </Version>
+    </release>
     <release>
          <Version>
            <name>solr-9.4.0</name>

gradle/node.gradle

@@ -18,14 +18,35 @@
 configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(":solr:webapp")]) {
     apply plugin: "com.github.node-gradle.node"
 
+    def npmRegistry = "${ -> propertyOrEnvOrDefault("solr.npm.registry", "SOLR_NPM_REGISTRY", '') }"
+    if (!npmRegistry.isEmpty()) {
+        tasks.npmSetup {
+            args.addAll(['--registry', npmRegistry])
+        }
+
+        afterEvaluate {
+            tasks.withType(NpmTask).each { npmTask ->
+                npmTask.environment.put('NPM_CONFIG_REGISTRY', npmRegistry)
+            }
+            tasks.withType(NpxTask).each { npxTask ->
+                npxTask.environment.put('NPM_CONFIG_REGISTRY', npmRegistry)
+            }
+        }
+    }
+
     ext {
         rootNodeDir = "$rootDir/.gradle/node"
         nodeProjectDir = file("$rootNodeDir/$project.name")
     }
 
     node {
         download = true
-        version = "16.15.1" // LTS
+        version = "16.20.2" // LTS
+
+        def nodeDistUrl = "${ -> propertyOrEnvOrDefault("solr.node.distUrl", "SOLR_NODE_DIST_URL", '') }"
+        if (!nodeDistUrl.isEmpty()) {
+            distBaseUrl = nodeDistUrl
+        }
 
         // The directory where Node.js is unpacked (when download is true)
         workDir = file("${project.ext.rootNodeDir}/nodejs")

help/localSettings.txt

@@ -6,3 +6,19 @@ and save a project-local 'gradle.properties' file from a template,
 with some default settings which you can modify.
 
 See your 'gradle.properties' file for more details of those settings.
+
+Building without access to the internet
+---------------------------------------
+
+-- Node --
+There are a few tasks that rely on downloading node itself and node tools from NPM.
+These include the Reference Guide build, the integration (e2e) tests and the webapp build.
+Some of these can be disabled, however other tasks such as building the solr webapp often cannot be disabled.
+
+In order to set a Node Distribution base URL for Gradle to download Node from, please use either:
+- The "SOLR_NODE_DIST_URL" environment variable
+- The "-Psolr.node.distUrl" Gradle property.
+
+In order to set a NPM registry for Gradle to connect to, please use either:
+- The "SOLR_NPM_REGISTRY" environment variable
+- The "-Psolr.npm.registry" Gradle property.

solr/CHANGES.txt

@@ -78,12 +78,40 @@ Other Changes
 
 * SOLR-16995: Add a ReplicaCount class to keep track of replicas per type (Vincent Primault)
 
+==================  9.6.0 ==================
+New Features
+---------------------
+(No changes)
+
+Improvements
+---------------------
+* SOLR-17119: When registering or updating a ConfigurablePlugin through the `/cluster/plugin` API,
+  config validation exceptions are now propagated to the callers. (Yohann Callea)
+
+Optimizations
+---------------------
+(No changes)
+
+Bug Fixes
+---------------------
+(No changes)
+
+Dependency Upgrades
+---------------------
+(No changes)
+
+Other Changes
+---------------------
+(No changes)
+
 ==================  9.5.0 ==================
 New Features
 ---------------------
 * SOLR-17006: Collection creation & adding replicas: User-defined properties are persisted to state.json and
   applied to new replicas, available for use as property substitution in configuration files.  (Vincent Primault)
 
+* SOLR-16986: Log CPU time per request via solr.log.cputime (Gilles Bellaton, David Smiley)
+
 * SOLR-16974: Circuit Breakers can now be configured globally (janhoy, Christine Poerschke)
 
 * SOLR-16743: When using TLS, Solr can now auto-reload the keystore and truststore without the need to restart the process.
@@ -127,9 +155,8 @@ Improvements
 * SOLR-17063: Do not retain log param references in LogWatcher (Michael Gibney)
 
 * SOLR-17066: SolrClient builders now allow users to specify a "default" collection or core
-  using the `withDefaultDataStore` method  ("Cloud" client builders retain the more specific
-  `withDefaultCollection`).  Use of the Builder methods is preferable to including the
-  collection in the base URL accepted by certain client implementations. (Jason Gerlowski)
+  using the `withDefaultCollection` method.  Use of the Builder methods is preferable to including
+  the collection in the base URL accepted by certain client implementations. (Jason Gerlowski)
 
 * SOLR-15960: Unified use of system properties and environment variables (janhoy)
 
@@ -138,6 +165,11 @@ Improvements
 
 * PR#2186: Include the external file name in the log instead of the hard-coded value in FileFloatSource.java. (Hamzeh Aldmour via Uwe Schindler)
 
+* SOLR-17096: solr.xml now supports declaring clusterSingleton plugins (Paul McArthur, David Smiley)
+
+* SOLR-16397: The v2 endpoint to request the status of asynchronous CoreAdmin commands has been updated to be more REST-ful.
+  Now available at `GET /api/node/commands/someRequestId` (Sanjay Dutt via Jason Gerlowski)
+
 Optimizations
 ---------------------
 * SOLR-17084: LBSolrClient (used by CloudSolrClient) now returns the count of core tracked as not live AKA zombies
@@ -149,10 +181,6 @@ Optimizations
 
 Bug Fixes
 ---------------------
-* SOLR-6853: Allow '/' characters in the text managed by Managed Resources API. (Nikita Rusetskii via Eric Pugh)
-
-* SOLR-17039: Entropy calculation in bin/solr script fails in Docker due to missing 'bc' cmd (janhoy)
-
 * SOLR-17045: DenseVectorField w/ vectorDimension > 1024 now work automatically with _default configset, due to
   implicit use of SchemaCodecFactory.  (hossman)
 
@@ -166,22 +194,23 @@ Bug Fixes
 
 * SOLR-17090: The v2 "delete alias" API no longer errantly returns a 405 status code (Jason Gerlowski)
 
-* SOLR-17057: JSON Query regression: If "query" is specified with a String (not JSON structure),
-  "defType" should parse it.  Since 9.4 defType was ignored.  (David Smiley)
+* SOLR-17121: Fix SchemaCodecFactory to get PostingsFormat and DocValues from field. (Bruno Roustant, David Smiley)
 
-* SOLR-17060: CoreContainer#create may deadlock with concurrent requests for metrics (Alex Deparvu, David Smiley)
+* SOLR-17116: The INSTALLSHARDDATA "collection-admin" API now reports errors correctly when run asynchronously. (Jason Gerlowski)
 
-* SOLR-17098: ZK Credentials and ACLs are no longer sent to all ZK Servers when using Streaming Expressions.
-  They will only be used when sent to the default ZK Host. (Houston Putman, Jan Høydahl, David Smiley, Gus Heck, Qing Xu)
+* SOLR-17074: Fixed not correctly escaped quote in bin/solr script (Dominique Béjean, Vincenzo D'Amore)
 
-* SOLR-16203: Properly initialize schema plugins loaded by SPI name (janhoy, hossman, Uwe Schindler)
+* SOLR-17120: Fix NullPointerException in UpdateLog.applyOlderUpdates that can occur if there are multiple partial
+  updates of the same document in separate requests using commitWithin. (Calvin Smith, Christine Poerschke)
 
 Dependency Upgrades
 ---------------------
 * SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (Kevin Risden)
 
 * SOLR-17026: Upgrade to Gradle 8.4 (Kevin Risden)
 
+* SOLR-17089: Upgrade Jersey to 3.1.5 (Jason Gerlowski)
+
 Other Changes
 ---------------------
 * SOLR-17024: Remove support for the long-defunct "collectionDefaults" clusterprops key (Jason Gerlowski)
@@ -193,11 +222,77 @@ Other Changes
 * SOLR-17091: dev tools script cloud.sh became broken after changes in 9.3 added a new -slim.tgz file it was not expecting
   cloud.sh has been updated to ignore the -slim.tgz version of the tarball.
 
-* SOLR-16949: Restrict certain file types from being uploaded to or downloaded from Config Sets (janhoy, Houston Putman)
-
 * SOLR-16880: Solr now produces an OpenAPI Specification artifact on releases ("solr-openapi-x.y.z.json") that covers
   Solr's v2 APIs. (Jason Gerlowski, Houston Putman)
 
+==================  9.4.1 ==================
+Bug Fixes
+---------------------
+* SOLR-17039: Entropy calculation in bin/solr script fails in Docker due to missing 'bc' cmd (janhoy)
+
+* SOLR-17057: JSON Query regression: If "query" is specified with a String (not JSON structure),
+  "defType" should parse it.  Since 9.4 defType was ignored.  (David Smiley)
+
+* SOLR-6853: Allow '/' characters in the text managed by Managed Resources API. (Nikita Rusetskii via Eric Pugh)
+
+* SOLR-17060: CoreContainer#create may deadlock with concurrent requests for metrics (Alex Deparvu, David Smiley)
+
+* SOLR-17098: ZK Credentials and ACLs are no longer sent to all ZK Servers when using Streaming Expressions.
+  They will only be used when sent to the default ZK Host. (Houston Putman, Jan Høydahl, David Smiley, Gus Heck, Qing Xu)
+
+* SOLR-16203: Properly initialize schema plugins loaded by SPI name (janhoy, hossman, Uwe Schindler)
+
+Dependency Upgrades
+---------------------
+* PR#2165: Update org.eclipse.jetty*:* to v10.0.19 (solrbot)
+
+* PR#2159: Update io.netty:* to v4.1.104.Final (solrbot)
+
+* PR#2048: Update dependency commons-cli:commons-cli to v1.6.0 (solrbot)
+
+* PR#2174: Update org.slf4j:* to v2.0.10 (solrbot)
+
+* PR#2135: Update dependency com.fasterxml.jackson:jackson-bom to v2.16.1 (solrbot)
+
+* PR#2138: Update dependency org.apache.commons:commons-compress to v1.25.0 (solrbot)
+
+* PR#2139: Update dependency org.apache.commons:commons-lang3 to v3.14.0 (solrbot)
+
+* PR#2035: Update dependency com.google.errorprone:error_prone_annotations to v2.23.0 (solrbot)
+
+* PR#2036: Update io.grpc:grpc-* to v1.59.0 (solrbot)
+
+* PR#2037: Update org.apache.logging.log4j:* to v2.21.0 (solrbot)
+
+* PR#2033: Update io.dropwizard.metrics:* to v4.2.21 (solrbot)
+
+* PR#2032: Update dependency io.swagger.core.v3:swagger-annotations to v2.2.17 (solrbot)
+
+* PR#2015: Update dependency org.codehaus.woodstox:stax2-api to v4.2.2 (solrbot)
+
+* PR#2031: Update dependency com.fasterxml.jackson:jackson-bom to v2.15.3 (solrbot)
+
+* PR#2034: Update dependency com.github.spotbugs:spotbugs-annotations to v4.8.0 (solrbot)
+
+* PR#2014: Update dependency com.google.guava:guava to v32.1.3-jre (solrbot)
+
+* PR#2010: Update dependency org.immutables:value-annotations to v2.10.0 (solrbot)
+
+* PR#2009: Update dependency io.opentelemetry:opentelemetry-bom to v1.31.0 (solrbot)
+
+* PR#2008: Update dependency org.semver4j:semver4j to v5.2.2 (solrbot)
+
+* PR#1989: Update org.apache.zookeeper:* to v3.9.1 (solrbot)
+
+* PR#1743: SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (solrbot)
+
+* PR#1745: Update dependency com.google.cloud:google-cloud-bom to v0.204.0 (solrbot)
+
+
+Other Changes
+---------------------
+* SOLR-16949: Restrict certain file types from being uploaded to or downloaded from Config Sets (janhoy, Houston Putman)
+
 ==================  9.4.0 ==================
 New Features
 ---------------------

solr/api/build.gradle

@@ -44,10 +44,13 @@ configurations {
         canBeConsumed = true
         canBeResolved = false
     }
+
+    swaggerBuild.extendsFrom implementation
 }
 
 resolve {
   classpath = sourceSets.main.runtimeClasspath
+  buildClasspath = sourceSets.main.runtimeClasspath.plus(configurations.getByName("swaggerBuild"))
   resourcePackages = ["org.apache.solr.client.api.util", "org.apache.solr.client.api.endpoint"]
   outputDir = file(project.openApiSpecDir)
   outputFileName = "solr-openapi-${version}"
@@ -59,12 +62,14 @@ dependencies {
 
     implementation 'jakarta.ws.rs:jakarta.ws.rs-api'
     implementation 'com.fasterxml.jackson.core:jackson-annotations'
-    api 'io.swagger.core.v3:swagger-annotations'
+    api 'io.swagger.core.v3:swagger-annotations-jakarta'
     implementation 'org.semver4j:semver4j'
 
     testImplementation project(':solr:test-framework')
     testImplementation project(':solr:api')
     testImplementation 'org.apache.lucene:lucene-test-framework'
+
+    swaggerBuild 'io.swagger.core.v3:swagger-jaxrs2-jakarta'
 }
 
 // Non-Java client generation tasks below:

solr/api/src/java/org/apache/solr/client/api/endpoint/AddReplicaPropertyApi.java

@@ -20,9 +20,9 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import org.apache.solr.client.api.model.AddReplicaPropertyRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 

solr/api/src/java/org/apache/solr/client/api/endpoint/AliasPropertyApis.java

@@ -19,11 +19,11 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import org.apache.solr.client.api.model.GetAliasPropertyResponse;
 import org.apache.solr.client.api.model.GetAllAliasPropertiesResponse;
 import org.apache.solr.client.api.model.SolrJerseyResponse;

solr/api/src/java/org/apache/solr/client/api/endpoint/BalanceReplicasApi.java

@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
 import org.apache.solr.client.api.model.BalanceReplicasRequestBody;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 

solr/api/src/java/org/apache/solr/client/api/endpoint/BalanceShardUniqueApi.java

@@ -17,9 +17,9 @@
 package org.apache.solr.client.api.endpoint;
 
 import io.swagger.v3.oas.annotations.Operation;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import org.apache.solr.client.api.model.BalanceShardUniqueRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;
 

solr/api/src/java/org/apache/solr/client/api/endpoint/CollectionPropertyApi.java

@@ -17,10 +17,10 @@
 package org.apache.solr.client.api.endpoint;
 
 import io.swagger.v3.oas.annotations.Operation;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import org.apache.solr.client.api.model.SolrJerseyResponse;
 import org.apache.solr.client.api.model.UpdateCollectionPropertyRequestBody;
 

solr/api/src/java/org/apache/solr/client/api/endpoint/CoreSnapshotApi.java

@@ -18,12 +18,12 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
 import org.apache.solr.client.api.model.CreateCoreSnapshotResponse;
 import org.apache.solr.client.api.model.DeleteSnapshotResponse;
 import org.apache.solr.client.api.model.ListCoreSnapshotsResponse;

solr/api/src/java/org/apache/solr/client/api/endpoint/CreateCollectionApi.java

@@ -17,8 +17,8 @@
 package org.apache.solr.client.api.endpoint;
 
 import io.swagger.v3.oas.annotations.Operation;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
 import org.apache.solr.client.api.model.CreateCollectionRequestBody;
 import org.apache.solr.client.api.model.SubResponseAccumulatingJerseyResponse;