From b7ea9e05577b312fb03a2f6f9e7ea0ee53da2bc1 Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Thu, 17 Jun 2021 17:07:25 +0200
Subject: [PATCH] MNT-22393 Fix dependencies with master branch

---
 pom.xml                                       | 12 ++-
 .../src/main/resources/licenses/notice.txt    | 88 +++++++++----------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b61b7ec4..8befa24f7 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.5</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 -->
@@ -39,7 +39,17 @@
       <licenseName>enterprise</licenseName>
       <license.update.dryrun>true</license.update.dryrun>
       <license.update.copyright>false</license.update.copyright>
+      <dependency.apache-commons-compress.version>1.20</dependency.apache-commons-compress.version>
    </properties>
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>${dependency.apache-commons-compress.version}</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
    <modules>
       <module>search-services</module>
       <module>insight-engine</module>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index bede132c7..847ae7c27 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -38,6 +38,7 @@ commons-dbcp-1.4.jar http://jakarta.apache.org/commons/
 commons-logging-1.1.3.jar http://jakarta.apache.org/commons/
 commons-lang3-3.12.0.jar http://jakarta.apache.org/commons/
 commons-pool-1.5.4.jar http://jakarta.apache.org/commons/
+commons-compress-1.20.jar https://commons.apache.org/proper/commons-compress/
 chemistry-opencmis-commons-impl-1.1.0.jar      http://chemistry.apache.org/
 chemistry-opencmis-commons-api-1.1.0.jar       http://chemistry.apache.org/
 xmlschema-core-2.2.5.jar http://ws.apache.org/commons/XmlSchema/
@@ -71,19 +72,19 @@ xercesImpl-2.12.1.jar http://xerces.apache.org/xerces2-j
 guessencoding-1.4.jar   http://docs.codehaus.org/display/GUESSENC/
 jug-2.0.0-asl.jar   http://jug.safehaus.org/
 acegi-security-0.8.2_patched.jar        http://sourceforge.net/projects/acegisecurity/
-jetty-continuation-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-deploy-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-http-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-io-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-jmx-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-rewrite-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-security-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-server-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-servlet-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-servlets-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-util-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-webapp-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
-jetty-xml-9.3.14.v20161028.jar https://www.eclipse.org/jetty/licenses.html
+jetty-continuation-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-deploy-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-http-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-io-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-jmx-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-rewrite-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-security-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-server-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-servlet-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-servlets-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-util-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-webapp-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
+jetty-xml-9.3.29.v20201019.jar https://www.eclipse.org/jetty/licenses.html
 woodstox-core-5.0.3.jar https://github.com/FasterXML/woodstox
 aggdesigner-algorithm-6.0.jar https://github.com/julianhyde/aggdesigner
 
@@ -121,8 +122,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.13.0.jar
@@ -136,10 +137,9 @@ commons-codec-1.10.jar
 commons-collections-3.2.2.jar
 commons-collections4-4.1.jar
 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
@@ -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.5.jar
-lucene-analyzers-icu-6.6.5-patched.5.jar
-lucene-analyzers-kuromoji-6.6.5-patched.5.jar
-lucene-analyzers-morfologik-6.6.5-patched.5.jar
-lucene-analyzers-phonetic-6.6.5-patched.5.jar
-lucene-analyzers-smartcn-6.6.5-patched.5.jar
-lucene-analyzers-stempel-6.6.5-patched.5.jar
-lucene-backward-codecs-6.6.5-patched.5.jar
-lucene-classification-6.6.5-patched.5.jar
-lucene-codecs-6.6.5-patched.5.jar
-lucene-core-6.6.5-patched.5.jar
-lucene-expressions-6.6.5-patched.5.jar
-lucene-grouping-6.6.5-patched.5.jar
-lucene-highlighter-6.6.5-patched.5.jar
-lucene-join-6.6.5-patched.5.jar
-lucene-memory-6.6.5-patched.5.jar
-lucene-misc-6.6.5-patched.5.jar
-lucene-queries-6.6.5-patched.5.jar
-lucene-queryparser-6.6.5-patched.5.jar
-lucene-sandbox-6.6.5-patched.5.jar
-lucene-spatial-extras-6.6.5-patched.5.jar
-lucene-suggest-6.6.5-patched.5.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.5.jar
-solr-clustering-6.6.5-patched.5.jar
-solr-core-6.6.5-patched.5.jar
-solr-langid-6.6.5-patched.5.jar
-solr-solrj-6.6.5-patched.5.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