[lucene-solr] 15/18: merging with masster

[is...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ishan pushed a commit to branch jira/solr14827
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit ac536c49add2a42cd4f6baa2577f4e68cca200fb
Author: Noble Paul <no...@gmail.com>
AuthorDate: Mon Oct 12 12:21:28 2020 +1100

    merging with masster
---
 .../src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java    | 1 +
 solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
index cc90983..a2dd291 100644
--- a/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
+++ b/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.apache.solr.common.util.DOMUtil;
 import org.apache.solr.common.ConfigNode;
 import org.apache.solr.common.util.DOMUtil;
+import org.w3c.dom.Node;
 
 /**
  *
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java
index 57861c1..9085ffc 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java
@@ -16,13 +16,14 @@
  */
 package org.apache.solr.common.util;
 
+import org.apache.solr.common.SolrException;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.function.Function;
 
-import org.apache.solr.common.SolrException;
 
 /**
  * Breaking out some utility methods into a separate class as part of SOLR-4196. These utils have nothing to do with