Upgrade tomcat and solr