Apache Solr open-source search software
SOLR-16433: Security Manager prevents Solr SQL from working (#1044)
Kevin Risden0133739cadbc
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 65caae78648..c535eff1b42 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -213,6 +213,8 @@ Bug Fixes* SOLR-16457: solr.data.home should not be set to empty string in bin/solr (Kevin Risden)+* SOLR-16433: Security Manager prevents Solr SQL from working (Kevin Risden)+Other Changes---------------------* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)diff --git a/solr/modules/sql/src/resources/saffron.properties b/solr/modules/sql/src/resources/saffron.propertiesnew file mode 100644index 00000000000..4a60b5d34e2--- /dev/null+++ b/solr/modules/sql/src/resources/saffron.properties@@ -0,0 +1,2 @@+# See SOLR-16433 and CALCITE-5298+calcite.test.dataset=.diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.javaindex a1230ab80b5..2218b815ade 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java@@ -56,7 +56,7 @@ public class DriverImpl implements Driver {if (!props.containsKey("collection")) {throw new SQLException(- "The connection url has no connection properties. At a mininum the collection must be specified.");+ "The connection url has no connection properties. At a minimum the collection must be specified.");}String collection = (String) props.remove("collection");