Patch switching the solr-core module's servlet-api dependency from "compile" to "provided" scope. This causes it to not be placed on the runtime classpath.
This change makes most Solr contrib modules' tests fail because of missing classes contained in the servlet-api jar. For those modules with failing tests, I added a servlet-api test dependency.
All trunk Solr tests pass for me locally under Maven.