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] 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>