Merge branch '2.1.x'

Closes gh-16572

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -1813,11 +1813,6 @@
 				<artifactId>solr-test-framework</artifactId>
 				<version>${solr.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.solr</groupId>
-				<artifactId>solr-uima</artifactId>
-				<version>${solr.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.solr</groupId>
 				<artifactId>solr-velocity</artifactId>