Merge branch 'master' into feature/search-2318-travis-build

search-services/alfresco-search/pom.xml

@@ -158,18 +158,24 @@
         </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 
+			version provided by SOLR 6.6.x)
+			Upgrading manually Calcite version to 1.15.0
 			to support this kind of functions -->
 		<dependency>
 			<groupId>org.apache.calcite</groupId>
 			<artifactId>calcite-core</artifactId>
-			<version>1.12.0</version>
+			<version>1.13.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.calcite</groupId>
 			<artifactId>calcite-linq4j</artifactId>
-			<version>1.12.0</version>
+			<version>1.13.0</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.calcite.avatica</groupId>
+            <artifactId>avatica-core</artifactId>
+            <version>1.13.0</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

search-services/packaging/src/docker/Dockerfile

@@ -1,6 +1,6 @@
 # Alfresco Search Services ${project.version} Docker Image
 
-FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-480e2906d08a
+FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-dcd8edf6cb70
 LABEL creator="Gethin James" maintainer="Alfresco Search Services Team"
 
 ENV DIST_DIR /opt/alfresco-search-services

search-services/packaging/src/main/resources/licenses/notice.txt

@@ -124,8 +124,10 @@ bcmail-jdk15on-1.47.jar
 bcprov-jdk15on-1.47.jar
 boilerpipe-1.1.0.jar
 caffeine-2.4.0.jar
-calcite-core-1.12.0.jar
-calcite-linq4j-1.12.0.jar
+calcite-core-1.13.0.jar
+calcite-linq4j-1.13.0.jar
+avatica-core-1.13.0.jar
+avatica-metrics-1.13.0.jar
 carrot2-guava-18.0.jar
 carrot2-mini-3.15.0.jar
 commons-cli-1.2.jar