Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into fix/SEARCH-2143_merge_from_master

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>

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>

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