From 61063468d3586075fcd320cbc92f4e0adbf63465 Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Mon, 13 Apr 2020 16:14:39 +0200
Subject: [PATCH 1/2] SEARCH-2169: Upgrading Calcite to 1.12.0 to fix some Date
 Fields issues existing in provided SOLR 6.6.x version (1.11.0) Tests are
 implemented only for constants values, as currently Alfresco SOLR Dates are
 returned as String.

---
 search-services/alfresco-search/pom.xml | 14 ++++++++++++++
 search-services/packaging/pom.xml       |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 2c8b3ddaa..57d4c2881 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -157,6 +157,20 @@
             <version>1.1.4c</version>
         </dependency>
 
+		<!-- DATE Functions (YEAR, MONTH, ...) are broken in Calcite 1.11.0 (default 
+			version provided by SOLR 6.6.x) Upgrading manually Calcite version to 1.12.0 
+			to support this kind of functions -->
+		<dependency>
+			<groupId>org.apache.calcite</groupId>
+			<artifactId>calcite-core</artifactId>
+			<version>1.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.calcite</groupId>
+			<artifactId>calcite-linq4j</artifactId>
+			<version>1.12.0</version>
+		</dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index b9b378c4b..db46452b0 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -159,6 +159,8 @@
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/dom4j-1.6.1.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/woodstox-core-asl-4.4.1.jar" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/calcite-core-1.11.0.jar" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/calcite-linq4j-1.11.0.jar" />
                             </target>
 
                         </configuration>

From 45ba419c15a127d4af3cc8b4c05efea19c8ffc29 Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Mon, 13 Apr 2020 17:19:40 +0200
Subject: [PATCH 2/2] SEARCH-2169: Add the new licenses required by Calcite
 1.12.0

---
 .../packaging/src/main/resources/licenses/notice.txt   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index c8e78d032..e535b294a 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -20,6 +20,7 @@ antlr-runtime-3.5.2.jar http://www.antlr.org/
 ST4-4.0.8.jar   https://www.stringtemplate.org/license.html
 antlr-3.5.2.jar http://www.antlr.org/
 jaxen-1.2.0.jar http://www.cafeconleche.org/jaxen/
+jsr305-3.0.1.jar http://code.google.com/p/jsr-305/
 
 
 === BSD variant License ===
@@ -33,8 +34,10 @@ json-20160212.jar       http://code.google.com/p/json-simple/
 === Apache 2.0 ===
 xml-resolver-1.2.jar    https://github.com/FasterXML/jackson
 neethi-3.1.1.jar http://ws.apache.org/commons/neethi/
-commons-logging-1.2.jar http://jakarta.apache.org/commons/
+commons-dbcp-1.4.jar http://jakarta.apache.org/commons/
+commons-logging-1.1.3.jar http://jakarta.apache.org/commons/
 commons-lang3-3.10.jar http://jakarta.apache.org/commons/
+commons-pool-1.5.4.jar http://jakarta.apache.org/commons/
 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/
@@ -83,6 +86,7 @@ jetty-util-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
 jetty-webapp-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
 jetty-xml-9.3.27.v20190418.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
 
 
 === CDDL 1.1 ===
@@ -120,8 +124,8 @@ 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
-calcite-linq4j-1.11.0.jar
+calcite-core-1.12.0.jar
+calcite-linq4j-1.12.0.jar
 carrot2-guava-18.0.jar
 carrot2-mini-3.15.0.jar
 commons-cli-1.2.jar