diff --git a/docker-compose.production.elife.yml b/docker-compose.production.elife.yml index 5b94f49d7b1c6180d7f8c1392f4abd196119b47e..1a4f1d40fe09ac15a100455e587bbfe21f938814 100644 --- a/docker-compose.production.elife.yml +++ b/docker-compose.production.elife.yml @@ -52,7 +52,7 @@ services: - ./db-data:/var/lib/postgresql/data/kotahi:z job-xsweet: - image: pubsweet/job-xsweet:1.5.0 + image: cokoapps/job-xsweet:1.5.1 environment: - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-db}:${POSTGRES_PORT}/${POSTGRES_DB} depends_on: diff --git a/docker-compose.production.ncrc.yml b/docker-compose.production.ncrc.yml index 49a5c276595b0a55dbdcf8081d7e58f5f8a91e2a..3a16954d6791a96fbfcec28af5a01d2750a72d28 100644 --- a/docker-compose.production.ncrc.yml +++ b/docker-compose.production.ncrc.yml @@ -52,7 +52,7 @@ services: - ./db-data:/var/lib/postgresql/data/kotahi:z job-xsweet: - image: pubsweet/job-xsweet:1.5.0 + image: cokoapps/job-xsweet:1.5.1 environment: - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-db}:${POSTGRES_PORT}/${POSTGRES_DB} depends_on: diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 3063a8f3eab9834baed91221165612bf883c508d..66b721686697f071c124016eea6ff0fc434594a4 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -38,7 +38,7 @@ services: - INSTANCE_NAME=${INSTANCE_NAME:-elife} job-xsweet: - image: pubsweet/job-xsweet:1.5.0 + image: cokoapps/job-xsweet:1.5.1 depends_on: - server command: diff --git a/docker-compose.yml b/docker-compose.yml index 7205cf7ea55d376b479e4bcdeea91f8c07ab2670..46b3caca50cb293b734833932e425354676b105a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,7 +80,7 @@ services: - ./server:/home/node/app/server job-xsweet: - image: pubsweet/job-xsweet:1.5.0 + image: cokoapps/job-xsweet:1.5.1 depends_on: - server command: diff --git a/package.json b/package.json index 0fff8235ed1551ca29394a458eeace6b9564bf36..51023f5980ab7c2eb7380403da5aab345cdf3d51 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "@pubsweet/base-model": "4.0.0", "@pubsweet/component-send-email": "0.4.3", "@pubsweet/errors": "^2.0.40", - "@pubsweet/job-xsweet": "^2.1.11", + "@pubsweet/job-xsweet": "^2.2.0", "@pubsweet/logger": "^0.2.50", "@pubsweet/model-user": "6.0.3", "@pubsweet/models": "^0.3.15", diff --git a/yarn.lock b/yarn.lock index 045d9b3f6a28e069be9e1a0b3eaac2a7c27518ec..7352381b11c60f60bcf30f5b5798859da1ba5c26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2509,6 +2509,21 @@ tmp-promise "^2.0.0" umzug "^2.1.0" +"@pubsweet/db-manager@^3.1.23": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.1.23.tgz#0d5f814605419f1dc53d6b4f306c4bfd279a9e9a" + integrity sha512-/cJq4nntAV5EzuctXapktQqYtj7ywMbcrQt0XMN6QRE5XzBZYevDUGdZdp+2GKhdUG/8pEsPFjDeHMgi1xWbyg== + dependencies: + "@hapi/joi" "^14.3.0" + "@pubsweet/logger" "^0.2.58" + fs-extra "^8.1.0" + knex "^0.21.1" + lodash "^4.17.11" + objection "^2.1.3" + pg "^7.8.0" + tmp-promise "^2.0.0" + umzug "^2.1.0" + "@pubsweet/errors@^2.0.36", "@pubsweet/errors@^2.0.40", "@pubsweet/errors@^2.0.44": version "2.0.44" resolved "https://registry.yarnpkg.com/@pubsweet/errors/-/errors-2.0.44.tgz#0270e4bc19702e79f5583f6161577a87536c57a1" @@ -2516,16 +2531,16 @@ dependencies: http-status-codes "^1.3.0" -"@pubsweet/job-xsweet@^2.1.11": - version "2.1.20" - resolved "https://registry.yarnpkg.com/@pubsweet/job-xsweet/-/job-xsweet-2.1.20.tgz#325eac40ac7765c7060105875bab59749bea8ee3" - integrity sha512-B5XPFMJY6gXDNFaW5cUW3+SO8EkTk5SFLOI85pQtX1TBm6ek4HpnAAJC0BH09IYDV22LUg36SQPVZISLFj1Rog== +"@pubsweet/job-xsweet@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@pubsweet/job-xsweet/-/job-xsweet-2.2.0.tgz#5a0c095cdb4a3232060555957a047701684d9411" + integrity sha512-yvYL9qkWZxDsFHCTFhShTPklox5PaR2Uz5DypkJWDHx4g91q/Hab9uDCBYKfQgjkFNoYN7jihz7FUHODbKzDsw== dependencies: - "@pubsweet/db-manager" "^3.1.19" - "@pubsweet/logger" "^0.2.54" + "@pubsweet/db-manager" "^3.1.23" + "@pubsweet/logger" "^0.2.58" express-fileupload v1.1.1-alpha.2 node-wait-for-it "^0.2.0" - pubsweet-server "^13.12.3" + pubsweet-server "^13.12.7" tmp-promise "^2.0.0" waait "^1.0.5" @@ -2537,6 +2552,14 @@ "@hapi/joi" "^14.5.0" config "^3.0.1" +"@pubsweet/logger@^0.2.58": + version "0.2.58" + resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.58.tgz#baab6a6f627e0861fd8d485f5f34fe92ffdca68c" + integrity sha512-8KmpEnEeqKLWWANcYbFyjEt/AHUwHVvJ/mMq3AYLPuwNmr2oifxfO3aps3YOFzAAdH3ayvhOXrL7P5D/HJkctg== + dependencies: + "@hapi/joi" "^14.5.0" + config "^3.0.1" + "@pubsweet/model-user@6.0.3": version "6.0.3" resolved "https://registry.yarnpkg.com/@pubsweet/model-user/-/model-user-6.0.3.tgz#b0ad3e307e293d9794f20bcc3797164732eb221b" @@ -16444,7 +16467,7 @@ pubsweet-client@^10.2.5: styled-normalize "^8.0.6" subscriptions-transport-ws "^0.9.12" -pubsweet-server@13.12.3, pubsweet-server@^13.11.6, pubsweet-server@^13.12.3: +pubsweet-server@13.12.3, pubsweet-server@^13.11.6, pubsweet-server@^13.12.3, pubsweet-server@^13.12.7: version "13.12.3" resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.12.3.tgz#f5fade9667000d2be8bc448f15b1df9a89fb58b2" integrity sha512-tl3LemBnFBBo5x/UucwevGDBYb2Jg7mwcYaxQ4tkzVHCoFqC9BB5wx9qGVHM9EwcwhiNMK+vqmzvDClFZrrbvw==