From 75f65095fda8413c95900ac5c7821e99d24c7551 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 00:15:04 +0000 Subject: [PATCH 1/5] Bump alfresco-data-model from 8.39 to 8.40 in /search-services Bumps [alfresco-data-model](https://github.com/Alfresco/alfresco-data-model) from 8.39 to 8.40. - [Release notes](https://github.com/Alfresco/alfresco-data-model/releases) - [Commits](https://github.com/Alfresco/alfresco-data-model/compare/8.39...8.40) Signed-off-by: dependabot-preview[bot] --- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 708d6d617..ea24778e8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,7 +22,7 @@ - 8.39 + 8.40 2.9.9 From 1ab601db0003324b12fe7a228de3481a046d3915 Mon Sep 17 00:00:00 2001 From: Michael Suzuki Date: Fri, 21 Jun 2019 11:49:17 +0100 Subject: [PATCH 2/5] Update 0008-index-content-using-transform-service.md --- .../0008-index-content-using-transform-service.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/search-services/alfresco-search/doc/architecture/decisions/0008-index-content-using-transform-service.md b/search-services/alfresco-search/doc/architecture/decisions/0008-index-content-using-transform-service.md index e067bff8f..747f32d21 100644 --- a/search-services/alfresco-search/doc/architecture/decisions/0008-index-content-using-transform-service.md +++ b/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: * Search Service to use the get rendition V1 Public API. @@ -37,11 +37,12 @@ Refactoring the current API used by Search Services provides the following benef * Minimal refactoring on the Search Services code base. * Minimum disruption to product. * Simple setup. +* Choice of disabling Transform Service or Embedded. * Delivery of the feature by fall 2019. -The preferred solution of using an event base would have been ideal but neither the repo, integration, or search teams are likely to have this ready by fall 2019. This will still remain a long term goal however for the short term we will progress with option 2. +The preferred solution of using an event base would have been ideal but neither the repo or search teams are likely to have this ready by fall 2019. This will still remain a long term goal however for the short term we will progress with option 2. ## Consequences -This solution moves the load and stress from the transformation to the repo. The repository will have additional nodes to store, which may put some load on the system however we are confident that it is within reason. This would benefit a benchmark test to validate the claim. Based on previous benchmarking tests, we are confident we can store the information. +This solution moves the load and stress from the repo to the Transform Service. The repository will have additional nodes to store, which may put some load on the system however we are confident that it is within reason. This would benefit a benchmark test to validate the claim. Based on previous benchmarking tests, we are confident we can store the information. Final note is the latency introduced due to the additional network calls, this is unavoidable when using the Transform Service but should not pose a problem. From 2de49b0be2ebfbfdde3a75eb0e7fed544851eb44 Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Fri, 21 Jun 2019 17:03:28 +0100 Subject: [PATCH 3/5] Search-1704: Fix solr.in.cmd to start with Java 11 --- search-services/packaging/config.properties | 2 +- .../packaging/src/docker/5.x/docker-compose.yml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties index 9be18bdcb..24a6a3984 100644 --- a/search-services/packaging/config.properties +++ b/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\ diff --git a/search-services/packaging/src/docker/5.x/docker-compose.yml b/search-services/packaging/src/docker/5.x/docker-compose.yml index 3a89f0ec7..e72d9c683 100644 --- a/search-services/packaging/src/docker/5.x/docker-compose.yml +++ b/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 \ No newline at end of file From d6f55eadf79bce795f359471e3e4ce3bd25b6ca7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2019 00:15:01 +0000 Subject: [PATCH 4/5] Bump alfresco-data-model from 8.40 to 8.41 in /search-services Bumps [alfresco-data-model](https://github.com/Alfresco/alfresco-data-model) from 8.40 to 8.41. - [Release notes](https://github.com/Alfresco/alfresco-data-model/releases) - [Commits](https://github.com/Alfresco/alfresco-data-model/compare/8.40...8.41) Signed-off-by: dependabot-preview[bot] --- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index ea24778e8..70a67ea3b 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,7 +22,7 @@ - 8.40 + 8.41 2.9.9 From 54e8dc6d160ee711dbae78a1f58031c9993fce7f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2019 00:15:11 +0000 Subject: [PATCH 5/5] Bump alfresco-data-model from 8.41 to 8.42 in /search-services Bumps [alfresco-data-model](https://github.com/Alfresco/alfresco-data-model) from 8.41 to 8.42. - [Release notes](https://github.com/Alfresco/alfresco-data-model/releases) - [Commits](https://github.com/Alfresco/alfresco-data-model/compare/8.41...8.42) Signed-off-by: dependabot-preview[bot] --- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 70a67ea3b..f3b91c1b1 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,7 +22,7 @@ - 8.41 + 8.42 2.9.9