Move Solr out to avoid dependency conflicts