From 70538ac03261e30e98d2a13c74c9109e3ece3279 Mon Sep 17 00:00:00 2001 From: Rhys Evans Date: Thu, 14 Jan 2021 21:07:53 +0000 Subject: [PATCH 01/13] upgraded neo4j db and driver --- .circleci/config.yml | 2 +- Makefile | 2 +- docker-compose.yaml | 2 +- package.json | 2 +- packages/tc-api-db-manager/db-connection.js | 2 +- packages/tc-api-db-manager/package.json | 2 +- packages/tc-api-rest-handlers/__tests__/patch-update.spec.js | 2 +- packages/tc-api-rest-handlers/lib/diff-properties.js | 2 +- packages/tc-api-rest-handlers/lib/neo4j-type-conversion.js | 4 ++-- scripts/neo4j-plugins | 2 +- test-helpers/db-connection.js | 2 +- test-helpers/test-fixtures.js | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdd294059..fb0f73b98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ references: TERM: xterm environment: - NEO4J_VERSION: '3.5.0' + NEO4J_VERSION: '4.1.5' workspace_root: &workspace_root ~/ diff --git a/Makefile b/Makefile index 1b4bc5953..5378f1f03 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ node_modules/@financial-times/rel-engage/index.mk: # --------------------------- LOCAL_BOLT_URL=bolt://localhost:7687 BIZ_OPS_BOLT_URL=${NEO4J_BOLT_URL} -NEO4J_VERSION=3.5.0 +NEO4J_VERSION=4.1.5 PRODUCT_NAME=biz-ops PROJECT_NAME=biz-ops-api diff --git a/docker-compose.yaml b/docker-compose.yaml index 0e8180fa0..5ae8b5410 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: neo4j: - image: neo4j:3.5.0 + image: neo4j:4.1.5 environment: - NEO4J_dbms_logs_query_enabled=true - NEO4J_AUTH=none diff --git a/package.json b/package.json index 58de5684b..53f2ab2dd 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "http-errors": "^1.7.3", "lodash": "^4.17.18", "module-alias": "^2.2.2", - "neo4j-driver": "^1.7.7", + "neo4j-driver": "^4.0.0", "node-fetch": "^2.6.0", "react": "^16.12.0", "react-dom": "^16.12.0", diff --git a/packages/tc-api-db-manager/db-connection.js b/packages/tc-api-db-manager/db-connection.js index a961cf81e..c38cf5b7d 100644 --- a/packages/tc-api-db-manager/db-connection.js +++ b/packages/tc-api-db-manager/db-connection.js @@ -1,4 +1,4 @@ -const neo4j = require('neo4j-driver').v1; +const neo4j = require('neo4j-driver'); const metrics = require('next-metrics'); const { logger } = require('@financial-times/tc-api-express-logger'); diff --git a/packages/tc-api-db-manager/package.json b/packages/tc-api-db-manager/package.json index f5e0c872d..25459c822 100644 --- a/packages/tc-api-db-manager/package.json +++ b/packages/tc-api-db-manager/package.json @@ -7,7 +7,7 @@ "@financial-times/n-logger": "^6.1.0", "@financial-times/tc-api-express-logger": "file:../tc-api-express-logger", "@financial-times/tc-schema-sdk": "file:../tc-schema-sdk", - "neo4j-driver": "^1.7.7", + "neo4j-driver": "^4.0.0", "next-metrics": "^3.1.22" }, "repository": { diff --git a/packages/tc-api-rest-handlers/__tests__/patch-update.spec.js b/packages/tc-api-rest-handlers/__tests__/patch-update.spec.js index c543829de..eb587385f 100644 --- a/packages/tc-api-rest-handlers/__tests__/patch-update.spec.js +++ b/packages/tc-api-rest-handlers/__tests__/patch-update.spec.js @@ -1,4 +1,4 @@ -const neo4jTemporalTypes = require('neo4j-driver/lib/v1/temporal-types'); +const neo4jTemporalTypes = require('neo4j-driver/lib/temporal-types'); const { setupMocks, neo4jTest } = require('../../../test-helpers'); const { dbUnavailable } = require('../../../test-helpers/error-stubs'); const { spyDbQuery } = require('../../../test-helpers/db-spies'); diff --git a/packages/tc-api-rest-handlers/lib/diff-properties.js b/packages/tc-api-rest-handlers/lib/diff-properties.js index f827615a8..de7bdd168 100644 --- a/packages/tc-api-rest-handlers/lib/diff-properties.js +++ b/packages/tc-api-rest-handlers/lib/diff-properties.js @@ -1,4 +1,4 @@ -const neo4jTemporalTypes = require('neo4j-driver/lib/v1/temporal-types'); +const neo4jTemporalTypes = require('neo4j-driver/lib/temporal-types'); const { getType } = require('@financial-times/tc-schema-sdk'); const isNullValue = val => val === null || val === ''; diff --git a/packages/tc-api-rest-handlers/lib/neo4j-type-conversion.js b/packages/tc-api-rest-handlers/lib/neo4j-type-conversion.js index 3f54b8ebd..243cdbdc8 100644 --- a/packages/tc-api-rest-handlers/lib/neo4j-type-conversion.js +++ b/packages/tc-api-rest-handlers/lib/neo4j-type-conversion.js @@ -2,8 +2,8 @@ const { isDateTime, isDate, isTime, -} = require('neo4j-driver/lib/v1/temporal-types'); -const neo4jTemporalTypes = require('neo4j-driver/lib/v1/temporal-types'); +} = require('neo4j-driver/lib/temporal-types'); +const neo4jTemporalTypes = require('neo4j-driver/lib/temporal-types'); const { getType } = require('@financial-times/tc-schema-sdk'); const entriesToObject = (map, [key, val]) => Object.assign(map, { [key]: val }); diff --git a/scripts/neo4j-plugins b/scripts/neo4j-plugins index 2f12d4dd0..a2ef7d917 100755 --- a/scripts/neo4j-plugins +++ b/scripts/neo4j-plugins @@ -1,6 +1,6 @@ #!/usr/bin/env bash mkdir -p neo4j/{plugins,logs,data} -wget -O neo4j/plugins/apoc-3.5.0.1-all.jar https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/3.5.0.1/apoc-3.5.0.1-all.jar +wget -O neo4j/plugins/apoc-4.1.0.4-all.jar https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/4.1.0.4/apoc-4.1.0.4-all.jar chmod 0644 neo4j/plugins/*.jar ls -la neo4j/plugins diff --git a/test-helpers/db-connection.js b/test-helpers/db-connection.js index 9dba57008..28cd169fa 100644 --- a/test-helpers/db-connection.js +++ b/test-helpers/db-connection.js @@ -1,4 +1,4 @@ -const neo4j = require('neo4j-driver').v1; +const neo4j = require('neo4j-driver'); const driver = neo4j.driver( process.env.NEO4J_BOLT_URL || 'bolt://localhost:7687', diff --git a/test-helpers/test-fixtures.js b/test-helpers/test-fixtures.js index 810b9f261..a74fc7032 100644 --- a/test-helpers/test-fixtures.js +++ b/test-helpers/test-fixtures.js @@ -1,4 +1,4 @@ -const { DateTime } = require('neo4j-driver/lib/v1/temporal-types.js'); +const { DateTime } = require('neo4j-driver/lib/temporal-types.js'); const { driver } = require('./db-connection'); From f551b28c9f20eca25abcd34f697e94e3d5bbc83e Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Mon, 18 Jan 2021 11:57:51 +0000 Subject: [PATCH 02/13] Add bolt config options for certificates --- docker-compose.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5ae8b5410..ff3167acb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,11 @@ services: neo4j: image: neo4j:4.1.5 environment: - - NEO4J_dbms_logs_query_enabled=true + - NEO4J_dbms_ssl_policy_bolt_enabled=true + - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates + - NEO4J_dbms_ssl_policy_bolt_private__key=private.key + - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt + - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes - NEO4J_db_temporal_timezone=Z @@ -15,3 +19,4 @@ services: - ./neo4j/data:/data - ./neo4j/plugins:/plugins - ./neo4j/logs:/logs + - ./certificates:/certificates From aa9bf3c7bb2eea2ee2636fcfd9aec59424b81e9c Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Mon, 18 Jan 2021 12:18:41 +0000 Subject: [PATCH 03/13] db.constraints no longer has a description field so using name instead --- packages/tc-api-db-manager/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tc-api-db-manager/index.js b/packages/tc-api-db-manager/index.js index 35b23d81b..7ecbfea2f 100755 --- a/packages/tc-api-db-manager/index.js +++ b/packages/tc-api-db-manager/index.js @@ -23,14 +23,14 @@ const initConstraints = async () => { const retrieveConstraints = async () => { const constraints = await executeQuery('CALL db.constraints'); return constraints.records.map(constraint => - constraint.get('description'), + constraint.get('name'), ); }; const retrieveIndexes = async () => { const indexes = await executeQuery('CALL db.indexes'); return indexes.records.map(constraint => - constraint.get('description'), + constraint.get('name'), ); }; From 5b81e3347a22207491e75a209b1ee1782e9bb8dc Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Mon, 18 Jan 2021 13:20:33 +0000 Subject: [PATCH 04/13] Linting --- packages/tc-api-db-manager/index.js | 4 +--- packages/tc-schema-sdk/data-accessors/graphql-defs.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/tc-api-db-manager/index.js b/packages/tc-api-db-manager/index.js index 7ecbfea2f..964e0fafa 100755 --- a/packages/tc-api-db-manager/index.js +++ b/packages/tc-api-db-manager/index.js @@ -29,9 +29,7 @@ const initConstraints = async () => { const retrieveIndexes = async () => { const indexes = await executeQuery('CALL db.indexes'); - return indexes.records.map(constraint => - constraint.get('name'), - ); + return indexes.records.map(constraint => constraint.get('name')); }; const existingConstraints = await retrieveConstraints(); diff --git a/packages/tc-schema-sdk/data-accessors/graphql-defs.js b/packages/tc-schema-sdk/data-accessors/graphql-defs.js index a392b3b5f..bf9496876 100644 --- a/packages/tc-schema-sdk/data-accessors/graphql-defs.js +++ b/packages/tc-schema-sdk/data-accessors/graphql-defs.js @@ -54,7 +54,7 @@ const addStaticDefinitions = composer => { }; const addEnumDefinitions = (composer, sdk) => { - Object.entries(sdk.getEnums({ withMeta: true })).map( + Object.entries(sdk.getEnums({ withMeta: true })).forEach( ([name, { description: enumDescription, options }]) => { const values = {}; Object.values(options).forEach( From b3e101b6e672f670d7f72f312b5af2a81c05f141 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Tue, 19 Jan 2021 16:21:28 +0000 Subject: [PATCH 05/13] Temp test without explicit certificate --- docker-compose.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ff3167acb..79d5d4b89 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,10 +3,6 @@ services: neo4j: image: neo4j:4.1.5 environment: - - NEO4J_dbms_ssl_policy_bolt_enabled=true - - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates - - NEO4J_dbms_ssl_policy_bolt_private__key=private.key - - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes @@ -19,4 +15,3 @@ services: - ./neo4j/data:/data - ./neo4j/plugins:/plugins - ./neo4j/logs:/logs - - ./certificates:/certificates From af65c81d0624ed716954278a19a42aa78cca8162 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Wed, 20 Jan 2021 09:10:15 +0000 Subject: [PATCH 06/13] Remove last reference to old neo4j driver --- docker-compose.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 79d5d4b89..2c78eb961 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,6 +3,10 @@ services: neo4j: image: neo4j:4.1.5 environment: +# - NEO4J_dbms_ssl_policy_bolt_enabled=true +# - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates-hide +# - NEO4J_dbms_ssl_policy_bolt_private__key=private.key +# - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes @@ -15,3 +19,4 @@ services: - ./neo4j/data:/data - ./neo4j/plugins:/plugins - ./neo4j/logs:/logs +# - ./certificates-hide:/certificates-hide From d12f3af1bb3903ebff39d02abf7566f929b31786 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Wed, 20 Jan 2021 09:23:31 +0000 Subject: [PATCH 07/13] Remove certificate settings --- docker-compose.yaml | 5 ----- packages/tc-api-rest-handlers/package.json | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2c78eb961..79d5d4b89 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,10 +3,6 @@ services: neo4j: image: neo4j:4.1.5 environment: -# - NEO4J_dbms_ssl_policy_bolt_enabled=true -# - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates-hide -# - NEO4J_dbms_ssl_policy_bolt_private__key=private.key -# - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes @@ -19,4 +15,3 @@ services: - ./neo4j/data:/data - ./neo4j/plugins:/plugins - ./neo4j/logs:/logs -# - ./certificates-hide:/certificates-hide diff --git a/packages/tc-api-rest-handlers/package.json b/packages/tc-api-rest-handlers/package.json index efb8e4108..7a3833fef 100644 --- a/packages/tc-api-rest-handlers/package.json +++ b/packages/tc-api-rest-handlers/package.json @@ -13,8 +13,7 @@ "common-tags": "^1.8.0", "http-errors": "^1.7.3", "lodash.isempty": "^4.4.0", - "lodash.groupby": "^4.6.0", - "neo4j-driver": "^1.7.6" + "lodash.groupby": "^4.6.0" }, "repository": { "type": "git", From b9b191a43abcbd6fcea15955b82491e89488cc49 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Wed, 20 Jan 2021 09:39:57 +0000 Subject: [PATCH 08/13] Update driver version --- packages/tc-api-rest-handlers/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tc-api-rest-handlers/package.json b/packages/tc-api-rest-handlers/package.json index 7a3833fef..034dae5be 100644 --- a/packages/tc-api-rest-handlers/package.json +++ b/packages/tc-api-rest-handlers/package.json @@ -13,7 +13,8 @@ "common-tags": "^1.8.0", "http-errors": "^1.7.3", "lodash.isempty": "^4.4.0", - "lodash.groupby": "^4.6.0" + "lodash.groupby": "^4.6.0", + "neo4j-driver": "^4.0.0" }, "repository": { "type": "git", From 8983ad2c6863407e506024d3afd0c5633e410b46 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Wed, 20 Jan 2021 13:30:52 +0000 Subject: [PATCH 09/13] Use specific v4.1 driver and bolt certificate --- Makefile | 2 +- docker-compose.yaml | 6 ++++++ package.json | 2 +- packages/tc-api-db-manager/package.json | 2 +- packages/tc-api-rest-handlers/package.json | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5378f1f03..962d52d4b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ node_modules/@financial-times/rel-engage/index.mk: # End generated by rel-engage # --------------------------- -LOCAL_BOLT_URL=bolt://localhost:7687 +LOCAL_BOLT_URL=neo4j://localhost:7687 BIZ_OPS_BOLT_URL=${NEO4J_BOLT_URL} NEO4J_VERSION=4.1.5 PRODUCT_NAME=biz-ops diff --git a/docker-compose.yaml b/docker-compose.yaml index 79d5d4b89..d3104b940 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,6 +3,11 @@ services: neo4j: image: neo4j:4.1.5 environment: + - NEO4J_dbms_connector_bolt_enabled=true + - NEO4J_dbms_ssl_policy_bolt_enabled=true + - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates/bolt +# - NEO4J_dbms_ssl_policy_bolt_private__key=private.key +# - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes @@ -15,3 +20,4 @@ services: - ./neo4j/data:/data - ./neo4j/plugins:/plugins - ./neo4j/logs:/logs + - ./neo4j/certificates:/certificates diff --git a/package.json b/package.json index 53f2ab2dd..67506f1e0 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "http-errors": "^1.7.3", "lodash": "^4.17.18", "module-alias": "^2.2.2", - "neo4j-driver": "^4.0.0", + "neo4j-driver": "^4.1.2", "node-fetch": "^2.6.0", "react": "^16.12.0", "react-dom": "^16.12.0", diff --git a/packages/tc-api-db-manager/package.json b/packages/tc-api-db-manager/package.json index 25459c822..6e028f812 100644 --- a/packages/tc-api-db-manager/package.json +++ b/packages/tc-api-db-manager/package.json @@ -7,7 +7,7 @@ "@financial-times/n-logger": "^6.1.0", "@financial-times/tc-api-express-logger": "file:../tc-api-express-logger", "@financial-times/tc-schema-sdk": "file:../tc-schema-sdk", - "neo4j-driver": "^4.0.0", + "neo4j-driver": "^4.1.2", "next-metrics": "^3.1.22" }, "repository": { diff --git a/packages/tc-api-rest-handlers/package.json b/packages/tc-api-rest-handlers/package.json index 034dae5be..4567b3483 100644 --- a/packages/tc-api-rest-handlers/package.json +++ b/packages/tc-api-rest-handlers/package.json @@ -14,7 +14,7 @@ "http-errors": "^1.7.3", "lodash.isempty": "^4.4.0", "lodash.groupby": "^4.6.0", - "neo4j-driver": "^4.0.0" + "neo4j-driver": "^4.1.2" }, "repository": { "type": "git", From 5e741bd04e3d55d632a33dbf218548afdb44c8fe Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Wed, 20 Jan 2021 13:51:20 +0000 Subject: [PATCH 10/13] Break the certificates to prove the circleci tests break --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index d3104b940..e1c8c396f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,7 @@ services: environment: - NEO4J_dbms_connector_bolt_enabled=true - NEO4J_dbms_ssl_policy_bolt_enabled=true - - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates/bolt +# - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates/bolt # - NEO4J_dbms_ssl_policy_bolt_private__key=private.key # - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt - NEO4J_dbms_logs_query_enabled=VERBOSE From 6cee7bd0116953165ca907ea784234dbf86bfae4 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Thu, 21 Jan 2021 08:43:52 +0000 Subject: [PATCH 11/13] Dump out contents of neo4j config --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 962d52d4b..ef038bac4 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ run-test-db: wget -q dist.neo4j.org/neo4j-community-$(NEO4J_VERSION)-unix.tar.gz; \ tar -xzf neo4j-community-$(NEO4J_VERSION)-unix.tar.gz -C neo4j --strip-components 1; \ sed -i "s|#dbms.security.auth_enabled=false|dbms.security.auth_enabled=false|g" neo4j/conf/neo4j.conf;\ + cat neo4j/conf/neo4j.conf;\ ./scripts/neo4j-plugins; \ dbms_memory_heap_initial_size="1024m" dbms_memory_heap_max_size="1024m" neo4j/bin/neo4j start; \ ./scripts/neo4j-wait-for-start; From 63e1505323f2f7113ea6430518760f2f4531daad Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Thu, 21 Jan 2021 11:57:00 +0000 Subject: [PATCH 12/13] Run tests without security --- docker-compose.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index e1c8c396f..79d5d4b89 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,11 +3,6 @@ services: neo4j: image: neo4j:4.1.5 environment: - - NEO4J_dbms_connector_bolt_enabled=true - - NEO4J_dbms_ssl_policy_bolt_enabled=true -# - NEO4J_dbms_ssl_policy_bolt_base__directory=/certificates/bolt -# - NEO4J_dbms_ssl_policy_bolt_private__key=private.key -# - NEO4J_dbms_ssl_policy_bolt_public__certificate=public.crt - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes @@ -20,4 +15,3 @@ services: - ./neo4j/data:/data - ./neo4j/plugins:/plugins - ./neo4j/logs:/logs - - ./neo4j/certificates:/certificates From 0d5e24925b0eed0ba48c3333f10c2211cfb916e4 Mon Sep 17 00:00:00 2001 From: "geoff.thorpe" Date: Thu, 21 Jan 2021 13:35:51 +0000 Subject: [PATCH 13/13] Upgrade to 4.1.6 --- .circleci/config.yml | 2 +- Makefile | 2 +- docker-compose.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb0f73b98..9c6c3c226 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ references: TERM: xterm environment: - NEO4J_VERSION: '4.1.5' + NEO4J_VERSION: '4.1.6' workspace_root: &workspace_root ~/ diff --git a/Makefile b/Makefile index ef038bac4..6ec7c64dc 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ node_modules/@financial-times/rel-engage/index.mk: # --------------------------- LOCAL_BOLT_URL=neo4j://localhost:7687 BIZ_OPS_BOLT_URL=${NEO4J_BOLT_URL} -NEO4J_VERSION=4.1.5 +NEO4J_VERSION=4.1.6 PRODUCT_NAME=biz-ops PROJECT_NAME=biz-ops-api diff --git a/docker-compose.yaml b/docker-compose.yaml index 79d5d4b89..b34396b83 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3' services: neo4j: - image: neo4j:4.1.5 + image: neo4j:4.1.6 environment: - NEO4J_dbms_logs_query_enabled=VERBOSE - NEO4J_AUTH=none