From 0bda0f928cb08360f70de04045646d5bec9fcdba Mon Sep 17 00:00:00 2001
From: Tom Page <thomas.page@alfresco.com>
Date: Wed, 27 Nov 2019 08:28:19 +0000
Subject: [PATCH] SEARCH-1974 SEARCH-1975 Upgrade to Solr 6.6.5-patched.2.

This includes later versions of commons-fileupload and bcprov.
---
 pom.xml                                       |  2 +-
 .../src/main/resources/licenses/notice.txt    | 60 +++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8863b968c..9af7a2537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
    <properties>
       <java.version>11</java.version>
       <solr.base.version>6.6.5</solr.base.version>
-      <solr.version>${solr.base.version}-patched.1</solr.version>
+      <solr.version>${solr.base.version}-patched.2</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/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index c23912a58..6ebd88fb5 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -116,8 +116,8 @@ asm-commons-5.1.jar
 aspectjrt-1.8.0.jar
 attributes-binder-1.3.1.jar
 avatica-core-1.9.0.jar
-bcmail-jdk15-1.45.jar
-bcprov-jdk15-1.45.jar
+bcmail-jdk15on-1.47.jar
+bcprov-jdk15on-1.47.jar
 boilerpipe-1.1.0.jar
 caffeine-2.4.0.jar
 calcite-core-1.11.0.jar
@@ -132,7 +132,7 @@ commons-compiler-2.7.6.jar
 commons-compress-1.14.jar
 commons-configuration-1.6.jar
 commons-exec-1.3.jar
-commons-fileupload-1.3.2.jar
+commons-fileupload-1.3.3.jar
 commons-io-2.5.jar
 commons-lang-2.6.jar
 commons-math3-3.4.1.jar
@@ -169,28 +169,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.1.jar
-lucene-analyzers-icu-6.6.5-patched.1.jar
-lucene-analyzers-kuromoji-6.6.5-patched.1.jar
-lucene-analyzers-morfologik-6.6.5-patched.1.jar
-lucene-analyzers-phonetic-6.6.5-patched.1.jar
-lucene-analyzers-smartcn-6.6.5-patched.1.jar
-lucene-analyzers-stempel-6.6.5-patched.1.jar
-lucene-backward-codecs-6.6.5-patched.1.jar
-lucene-classification-6.6.5-patched.1.jar
-lucene-codecs-6.6.5-patched.1.jar
-lucene-core-6.6.5-patched.1.jar
-lucene-expressions-6.6.5-patched.1.jar
-lucene-grouping-6.6.5-patched.1.jar
-lucene-highlighter-6.6.5-patched.1.jar
-lucene-join-6.6.5-patched.1.jar
-lucene-memory-6.6.5-patched.1.jar
-lucene-misc-6.6.5-patched.1.jar
-lucene-queries-6.6.5-patched.1.jar
-lucene-queryparser-6.6.5-patched.1.jar
-lucene-sandbox-6.6.5-patched.1.jar
-lucene-spatial-extras-6.6.5-patched.1.jar
-lucene-suggest-6.6.5-patched.1.jar
+lucene-analyzers-common-6.6.5-patched.2.jar
+lucene-analyzers-icu-6.6.5-patched.2.jar
+lucene-analyzers-kuromoji-6.6.5-patched.2.jar
+lucene-analyzers-morfologik-6.6.5-patched.2.jar
+lucene-analyzers-phonetic-6.6.5-patched.2.jar
+lucene-analyzers-smartcn-6.6.5-patched.2.jar
+lucene-analyzers-stempel-6.6.5-patched.2.jar
+lucene-backward-codecs-6.6.5-patched.2.jar
+lucene-classification-6.6.5-patched.2.jar
+lucene-codecs-6.6.5-patched.2.jar
+lucene-core-6.6.5-patched.2.jar
+lucene-expressions-6.6.5-patched.2.jar
+lucene-grouping-6.6.5-patched.2.jar
+lucene-highlighter-6.6.5-patched.2.jar
+lucene-join-6.6.5-patched.2.jar
+lucene-memory-6.6.5-patched.2.jar
+lucene-misc-6.6.5-patched.2.jar
+lucene-queries-6.6.5-patched.2.jar
+lucene-queryparser-6.6.5-patched.2.jar
+lucene-sandbox-6.6.5-patched.2.jar
+lucene-spatial-extras-6.6.5-patched.2.jar
+lucene-suggest-6.6.5-patched.2.jar
 metadata-extractor-2.9.1.jar
 metrics-core-3.2.2.jar
 metrics-ganglia-3.2.2.jar
@@ -214,11 +214,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.1.jar
-solr-clustering-6.6.5-patched.1.jar
-solr-core-6.6.5-patched.1.jar
-solr-langid-6.6.5-patched.1.jar
-solr-solrj-6.6.5-patched.1.jar
+solr-analysis-extras-6.6.5-patched.2.jar
+solr-clustering-6.6.5-patched.2.jar
+solr-core-6.6.5-patched.2.jar
+solr-langid-6.6.5-patched.2.jar
+solr-solrj-6.6.5-patched.2.jar
 spatial4j-0.6.jar
 start.jar
 stax2-api-3.1.4.jar