From 38178426e45636decf1ce279b49345a5eda7bacb Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@vmware.com>
Date: Tue, 13 Oct 2020 09:43:33 +0200
Subject: [PATCH] DATASOLR-607 - Upgrade to Apache Solr 8.6.3

---
 pom.xml                                                | 10 +++++++++-
 .../managed-schema/collection1/conf/solrconfig.xml     |  2 +-
 .../static-schema/collection1/conf/solrconfig.xml      |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ccddfe2da..f484cc151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 		<commons.collections>3.2.1</commons.collections>
 		<commons.lang>3.1</commons.lang>
 		<httpcomponents>4.3.1</httpcomponents>
-		<solr>8.5.2</solr>
+		<solr>8.6.3</solr>
 		<springdata.commons>2.4.0-SNAPSHOT</springdata.commons>
 		<java-module-name>spring.data.solr</java-module-name>
 	</properties>
@@ -143,6 +143,14 @@
 					<groupId>com.fasterxml.jackson.core</groupId>
 					<artifactId>jackson-core</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.restlet.jee</groupId>
+					<artifactId>org.restlet</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.restlet.jee</groupId>
+					<artifactId>org.restlet.ext.servlet</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
diff --git a/src/test/resources/managed-schema/collection1/conf/solrconfig.xml b/src/test/resources/managed-schema/collection1/conf/solrconfig.xml
index 29617d6e8..95944aa41 100644
--- a/src/test/resources/managed-schema/collection1/conf/solrconfig.xml
+++ b/src/test/resources/managed-schema/collection1/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>8.5.0</luceneMatchVersion>
+  <luceneMatchVersion>8.6.3</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/src/test/resources/static-schema/collection1/conf/solrconfig.xml b/src/test/resources/static-schema/collection1/conf/solrconfig.xml
index f667da6bd..615d77e9f 100644
--- a/src/test/resources/static-schema/collection1/conf/solrconfig.xml
+++ b/src/test/resources/static-schema/collection1/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>8.5.0</luceneMatchVersion>
+  <luceneMatchVersion>8.6.3</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in