You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2024/03/07 13:04:17 UTC

(solr) 01/02: Move EnvToSyspropMappings.properties to solrj module (#2320)

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

janhoy pushed a commit to branch branch_9_5
in repository https://gitbox.apache.org/repos/asf/solr.git

commit f255127fbb3cd97ba04d605268a54880c1a6fa70
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Tue Mar 5 09:47:54 2024 +0100

    Move EnvToSyspropMappings.properties to solrj module (#2320)
    
    (cherry picked from commit a32bf31d162c4c27451df1410cebf38b5e0a08c0)
---
 solr/CHANGES.txt                                                   | 3 ++-
 solr/{core => solrj}/src/resources/EnvToSyspropMappings.properties | 0
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 38105d19828..2d278488f09 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -8,7 +8,8 @@ https://github.com/apache/solr/blob/main/solr/solr-ref-guide/modules/upgrade-not
 ==================  9.5.1 ==================
 Bug Fixes
 ---------------------
-(No changes)
+* PR#2320: Avoid NullPointerException in SolrJ client due to missing
+  EnvToSyspropMappings.properties file (janhoy)
 
 Dependency Upgrades
 ---------------------
diff --git a/solr/core/src/resources/EnvToSyspropMappings.properties b/solr/solrj/src/resources/EnvToSyspropMappings.properties
similarity index 100%
rename from solr/core/src/resources/EnvToSyspropMappings.properties
rename to solr/solrj/src/resources/EnvToSyspropMappings.properties