From 8e5416e0ca7c1c42716657f64f727a23a7523f83 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Fri, 24 May 2019 14:35:16 +0100
Subject: [PATCH 1/3] SEARCH-1626 Ensure maven version can be extracted by
 Bamboo.

See this issue for more details:
https://bitbucket.org/dehringer/bamboo-maven-pom-extractor-plugin/issues/18/groupid-not-populated-if-using-parent-pom
---
 search-services/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/search-services/pom.xml b/search-services/pom.xml
index 51073e14a..8972f3c9c 100644
--- a/search-services/pom.xml
+++ b/search-services/pom.xml
@@ -6,7 +6,11 @@
         <artifactId>alfresco-search-and-insight-parent</artifactId>
         <version>1.4.0-SNAPSHOT</version>
     </parent>
+    <!-- The groupId and version are required by the maven pom extractor plugin on Bamboo - more details in this issue:
+    https://bitbucket.org/dehringer/bamboo-maven-pom-extractor-plugin/issues/18/groupid-not-populated-if-using-parent-pom -->
+    <groupId>org.alfresco</groupId>
     <artifactId>alfresco-search-parent</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Solr Search parent</name>
     <properties>

From 20e3c3bf2dd2d6d46af478e5db5c8db95d9f6ea7 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Fri, 24 May 2019 14:36:14 +0100
Subject: [PATCH 2/3] SEARCH-1626 Consolidate .gitignore files.

---
 search-services/.gitignore => .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 rename search-services/.gitignore => .gitignore (88%)

diff --git a/search-services/.gitignore b/.gitignore
similarity index 88%
rename from search-services/.gitignore
rename to .gitignore
index f8037e868..2e36ddf18 100644
--- a/search-services/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ target
 alf_data_dev
 alfresco.log*
 solr.log*
+alfresco-insight-engine/bin/
+packaging/bin/
 # OS generated files #
 ######################
 .DS_Store
@@ -17,6 +19,7 @@ solr.log*
 .Trashes
 ehthumbs.db
 Thumbs.db
+.git-rewrite
 
 #############
 # Test data #

From 20acf08d4f5bf59995262554cf89eecdaef22012 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Tue, 28 May 2019 12:06:56 +0100
Subject: [PATCH 3/3] Fix QParserPluginTest when run outside the UTC timezone.

---
 .../query/afts/qparser/QParserPluginTest.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java
index a270280e2..32c889d30 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java
@@ -19,8 +19,8 @@
 
 package org.alfresco.solr.query.afts.qparser;
 
-
 import static java.util.Arrays.stream;
+
 import static org.alfresco.model.ContentModel.PROP_CONTENT;
 import static org.alfresco.model.ContentModel.PROP_CREATED;
 import static org.alfresco.model.ContentModel.PROP_DESCRIPTION;
@@ -28,21 +28,25 @@ import static org.alfresco.model.ContentModel.PROP_NAME;
 import static org.alfresco.model.ContentModel.TYPE_CONTENT;
 import static org.alfresco.model.ContentModel.TYPE_THUMBNAIL;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.solr.dataload.TestDataProvider;
 import org.alfresco.util.CachingDateFormat;
+import org.alfresco.util.CachingDateFormat.SimpleDateFormatAndResolution;
 import org.apache.solr.SolrTestCaseJ4;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
 @SolrTestCaseJ4.SuppressSSL
 public class QParserPluginTest extends AbstractQParserPluginTest implements QueryConstants
 {
+    /** The UTC time zone. */
+    private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
     private final long [] msecs = {
             333,
             20000,
@@ -571,7 +575,9 @@ public class QParserPluginTest extends AbstractQParserPluginTest implements Quer
     {
         stream(CachingDateFormat.getLenientFormatters())
             .filter(formatter -> formatter.getResolution() < Calendar.DAY_OF_MONTH)
-            .map(formatter -> formatter.getSimpleDateFormat().format(FTS_TEST_DATE))
+            .map(SimpleDateFormatAndResolution::getSimpleDateFormat)
+            .peek(simpleDateFormat -> simpleDateFormat.setTimeZone(UTC))
+            .map(simpleDateFormat -> simpleDateFormat.format(FTS_TEST_DATE))
             .filter(date -> date.length() >= 9)
             .forEach(date -> assertAQuery("\\@" + escape(QName.createQName(TEST_NAMESPACE, "date-ista")) + ":\"" + date + "\"", 1));
     }