XWiki 16.2.0 will have an embedded Solr 9. The code should be changed to use the Solr instance in XWiki instead of a separate Solr instance.