Merge branch 'master' into 'search-adr-008'

# Conflicts:
#   search-services/alfresco-search/doc/architecture/decisions/0008-index-content-using-transform-service.md

search-services/alfresco-search/doc/architecture/decisions/0008-index-content-using-transform-service.md

@@ -12,7 +12,7 @@ The ability to search on content requires a content extraction process. This rel
 
 In order to scale this work, it is now off loaded to the Transform Service, which can be scaled to cope with the demand. This method of extracting the content is not integrated with Search Services and as a result any content transformed by the Transform Service is not searchable.
 
-The following are the suggested approach to indexing with Transform Service:
+The following are the suggested approaches to indexing with Transform Service:
 
 * Refactor the current V0 API (in use by Search Services) to make use of RenditionService2.
 

search-services/alfresco-solrclient-lib/pom.xml

@@ -22,7 +22,7 @@
     </distributionManagement>
 
     <properties>
-        <dependency.alfresco-data-model.version>8.39</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.42</dependency.alfresco-data-model.version>
         <dependency.jackson.version>2.9.9</dependency.jackson.version>
     </properties>
 

search-services/packaging/config.properties

@@ -3,7 +3,7 @@ alfresco.search.ssl.need=needclientauth" default="true"
 alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
 ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties
 alfresco.gc.logs=GC_LOG_OPTS=""
-alfresco.gc.logs.win=set "GC_LOG_OPTS= "
+alfresco.gc.logs.win=REM set "GC_LOG_OPTS= "
 alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\
 ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties
 alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\

search-services/packaging/src/docker/5.x/docker-compose.yml

@@ -3,7 +3,13 @@ services:
   platform:
     image: docker-internal.alfresco.com/platform:${ALFRESCO_TAG}
     environment:
-      JAVA_TOOL_OPTIONS: "-Dsolr.host=search -Dsolr.port=8983 -Dsolr.secureComms=none -Dsolr.base.url=/solr -Dindex.subsystem.name=solr6"
+      JAVA_TOOL_OPTIONS: "
+        -Dsolr.host=search
+        -Dsolr.port=8983
+        -Dsolr.secureComms=none
+        -Dsolr.base.url=/solr
+        -Dindex.subsystem.name=solr6
+        "
     ports:
       - "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
       - "5005:5005" #Java debugging
@@ -21,5 +27,7 @@ services:
       SOLR_SOLR_PORT: 8983
       #Create the default alfresco and archive cores
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      #HTTP by default
+      ALFRESCO_SECURE_COMMS: none
     ports:
       - "8083:8983" #Browser port for Solr