Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -487,9 +487,9 @@ opentelemetry-exporter-sender-okhttp = { module = "io.opentelemetry:opentelemetr
opentelemetry-runtime-telemetry = { module = "io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java17", version.ref = "opentelemetry-runtime-telemetry" }
opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry" }
opentelemetry-sdk-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "opentelemetry" }
opentelemetry-sdk-metrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry" }
opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry" }
opentelemetry-sdk-trace = { module = "io.opentelemetry:opentelemetry-sdk-trace", version.ref = "opentelemetry" }
opentelemetry-sdk-metrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry" }
osgi-annotation = { module = "org.osgi:osgi.annotation", version.ref = "osgi-annotation" }
oshai-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "oshai-logging" }
# @keep transitive dependency for version alignment
Expand Down
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ Other Changes
* SOLR-17879: A Solr node will now fail to start if it's major.minor version (e.g. 9.10) is *lower* than that of any existing
Solr node in a SolrCloud cluster (as reported by info in "live_node"). (David Smiley)

* SOLR-17956: XLSXResponseWriter has been deprecated and will be removed in a future release. (Jan Høydahl)

* SOLR-17952: Stream decorator test refactoring - use underscore rather than dot in aliases (Andy Webb)

================== 9.9.1 ==================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@
import org.apache.solr.schema.StrField;
import org.apache.solr.search.ReturnFields;

/** A .XLSX spreadsheet format {@link org.apache.solr.response.QueryResponseWriter}. */
/**
* A .XLSX spreadsheet format {@link org.apache.solr.response.QueryResponseWriter}.
*
* @deprecated This class will be removed in a future release.
*/
@Deprecated(since = "9.10", forRemoval = true)
public class XLSXResponseWriter implements QueryResponseWriter {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

public class TestXLSXResponseWriter extends SolrTestCaseJ4 {

private static XLSXResponseWriter writerXlsx;
private static QueryResponseWriter writerXlsx;

@BeforeClass
public static void beforeClass() throws Exception {
Expand All @@ -52,8 +52,8 @@ public static void beforeClass() throws Exception {
// find a reference to the default response writer so we can redirect its output later
SolrCore testCore = h.getCore();
QueryResponseWriter writer = testCore.getQueryResponseWriter("xlsx");
if (writer instanceof XLSXResponseWriter) {
writerXlsx = (XLSXResponseWriter) testCore.getQueryResponseWriter("xlsx");
if (writer != null) {
writerXlsx = writer;
} else {
throw new Exception("XLSXResponseWriter not registered with solr core");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -404,3 +404,8 @@ cp modules/extraction/lib/*.jar server/solr-webapp/webapp/WEB-INF/lib/
----

Once the libraries are in place, you can add `wt=xlsx` to your request, and results will be returned as an XLSX sheet.

[IMPORTANT]
====
The `XLSXResponseWriter` is deprecated and will be removed in a future release.
====
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ SolrJ users not using SolrClients that use Jetty HttpClient can safely exclude t

Java has removed support for the Security Manager starting with Java 24; therefore, Solr will disable this feature when run with Java 24 or later. Solr previously used the Security Manager to provide an additional layer of protection against unintended file system access, network access, and process execution. Users upgrading to Java 24 or later should review their security practices and consider alternative measures, such as running Solr in containers or implementing additional operating system-level controls.

=== Deprecations

The `XLSXResponseWriter` is now deprecated.

== Solr 9.9

=== SolrJ
Expand Down