From 0c3eae0c58171ce8854318a256644fb9fd656f30 Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Mon, 21 Jun 2021 09:41:19 +0200
Subject: [PATCH] MNT-22393 Update to Solr 6.6.5-patched.6 to avoid using
 "xmlbeans" library Cherry picked from 4f7955a

---
 pom.xml                                       |  2 +-
 search-services/alfresco-search/pom.xml       |  4 ++
 .../src/main/resources/licenses/notice.txt    | 55 +++++++++----------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff6888e59..c2e2a1fb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
    <properties>
       <maven.build.sourceVersion>11</maven.build.sourceVersion>
       <solr.base.version>6.6.5</solr.base.version>
-      <solr.version>${solr.base.version}-patched.4</solr.version>
+      <solr.version>${solr.base.version}-patched.6</solr.version>
       <!-- The location to download the solr zip file from. -->
       <!-- <solr.zip>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</solr.zip> -->
       <!-- Solr startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->
diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 25e1066d5..9a4f7b974 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -62,6 +62,10 @@
                     <artifactId>xercesImpl</artifactId>
                     <groupId>xerces</groupId>
                 </exclusion>
+                <exclusion>
+                	<groupId>org.apache.xmlbeans</groupId>
+                	<artifactId>xmlbeans</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index b430d4782..3558943a8 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -176,28 +176,28 @@ jul-to-slf4j-1.7.7.jar
 juniversalchardet-1.0.3.jar
 langdetect-1.1-20120112.jar
 log4j-1.2.17.jar
-lucene-analyzers-common-6.6.5-patched.4.jar
-lucene-analyzers-icu-6.6.5-patched.4.jar
-lucene-analyzers-kuromoji-6.6.5-patched.4.jar
-lucene-analyzers-morfologik-6.6.5-patched.4.jar
-lucene-analyzers-phonetic-6.6.5-patched.4.jar
-lucene-analyzers-smartcn-6.6.5-patched.4.jar
-lucene-analyzers-stempel-6.6.5-patched.4.jar
-lucene-backward-codecs-6.6.5-patched.4.jar
-lucene-classification-6.6.5-patched.4.jar
-lucene-codecs-6.6.5-patched.4.jar
-lucene-core-6.6.5-patched.4.jar
-lucene-expressions-6.6.5-patched.4.jar
-lucene-grouping-6.6.5-patched.4.jar
-lucene-highlighter-6.6.5-patched.4.jar
-lucene-join-6.6.5-patched.4.jar
-lucene-memory-6.6.5-patched.4.jar
-lucene-misc-6.6.5-patched.4.jar
-lucene-queries-6.6.5-patched.4.jar
-lucene-queryparser-6.6.5-patched.4.jar
-lucene-sandbox-6.6.5-patched.4.jar
-lucene-spatial-extras-6.6.5-patched.4.jar
-lucene-suggest-6.6.5-patched.4.jar
+lucene-analyzers-common-6.6.5-patched.6.jar
+lucene-analyzers-icu-6.6.5-patched.6.jar
+lucene-analyzers-kuromoji-6.6.5-patched.6.jar
+lucene-analyzers-morfologik-6.6.5-patched.6.jar
+lucene-analyzers-phonetic-6.6.5-patched.6.jar
+lucene-analyzers-smartcn-6.6.5-patched.6.jar
+lucene-analyzers-stempel-6.6.5-patched.6.jar
+lucene-backward-codecs-6.6.5-patched.6.jar
+lucene-classification-6.6.5-patched.6.jar
+lucene-codecs-6.6.5-patched.6.jar
+lucene-core-6.6.5-patched.6.jar
+lucene-expressions-6.6.5-patched.6.jar
+lucene-grouping-6.6.5-patched.6.jar
+lucene-highlighter-6.6.5-patched.6.jar
+lucene-join-6.6.5-patched.6.jar
+lucene-memory-6.6.5-patched.6.jar
+lucene-misc-6.6.5-patched.6.jar
+lucene-queries-6.6.5-patched.6.jar
+lucene-queryparser-6.6.5-patched.6.jar
+lucene-sandbox-6.6.5-patched.6.jar
+lucene-spatial-extras-6.6.5-patched.6.jar
+lucene-suggest-6.6.5-patched.6.jar
 metadata-extractor-2.9.1.jar
 metrics-core-3.2.2.jar
 metrics-ganglia-3.2.2.jar
@@ -221,11 +221,11 @@ rome-1.5.1.jar
 simple-xml-2.7.1.jar
 slf4j-api-1.7.7.jar
 slf4j-log4j12-1.7.7.jar
-solr-analysis-extras-6.6.5-patched.4.jar
-solr-clustering-6.6.5-patched.4.jar
-solr-core-6.6.5-patched.4.jar
-solr-langid-6.6.5-patched.4.jar
-solr-solrj-6.6.5-patched.4.jar
+solr-analysis-extras-6.6.5-patched.6.jar
+solr-clustering-6.6.5-patched.6.jar
+solr-core-6.6.5-patched.6.jar
+solr-langid-6.6.5-patched.6.jar
+solr-solrj-6.6.5-patched.6.jar
 spatial4j-0.6.jar
 start.jar
 stax2-api-3.1.4.jar
@@ -237,7 +237,6 @@ tika-parsers-1.16.jar
 tika-xmp-1.16.jar
 vorbis-java-core-0.8.jar
 vorbis-java-tika-0.8.jar
-xmlbeans-2.6.0.jar
 xmpcore-5.1.2.jar
 xz-1.6.jar
 zookeeper-3.4.10.jar