Skip to content

Commit

Permalink
Merge branch 'develop' into feature/iwtf-3617-retrieve-recurring-paym…
Browse files Browse the repository at this point in the history
…ents
  • Loading branch information
ScottDormand96 committed Nov 13, 2023
2 parents 8c154d2 + ff230b1 commit 65850f6
Show file tree
Hide file tree
Showing 22 changed files with 1,195 additions and 888 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@

## v1.37.0-rc.2 (2023-11-09)

#### :rocket: Enhancement
* [#1815](https://github.com/DEFRA/rod-licensing/pull/1815) Update critical dependencies ([@jaucourt](https://github.com/jaucourt))

#### Committers: 1
- Phil Benson ([@jaucourt](https://github.com/jaucourt))

## v1.37.0-rc.1 (2023-11-02)

#### :rocket: Enhancement
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"npmClient": "npm",
"publishConfig": {
"registry": "http://registry.npmjs.org/"
Expand Down
1,991 changes: 1,145 additions & 846 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"@babel/core": "^7.17.2",
"@babel/eslint-parser": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@ksmithut/prettier-standard": "0.0.10",
"@ksmithut/prettier-standard": "^0.0.10",
"@types/hapi__hapi": "^20.0.10",
"@types/jest": "^27.4.0",
"babel-jest": "^27.5.1",
"clone-deep": "^4.0.1",
"dynamics-web-api": "1.7.3",
"dynamics-web-api": "^1.7.3",
"eslint": "^7.32.0",
"husky": "^7.0.4",
"jest": "^27.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/business-rules-lib/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/business-rules-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/business-rules-lib",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Shared business rules for the rod licensing digital services",
"type": "module",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/connectors-lib/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/connectors-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/connectors-lib",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Shared connectors",
"type": "module",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/dynamics-lib/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/dynamics-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/dynamics-lib",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Framework to support integration with dynamics",
"type": "module",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/fulfilment-job/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/fulfilment-job/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/fulfilment-job",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Rod Licensing Sales Fulfilment Job",
"type": "module",
"engines": {
Expand Down Expand Up @@ -35,8 +35,8 @@
"test": "echo \"Error: run tests from root\" && exit 1"
},
"dependencies": {
"@defra-fish/connectors-lib": "1.37.0-rc.1",
"@defra-fish/dynamics-lib": "1.37.0-rc.1",
"@defra-fish/connectors-lib": "1.37.0-rc.2",
"@defra-fish/dynamics-lib": "1.37.0-rc.2",
"commander": "^7.2.0",
"debug": "^4.3.3",
"merge2": "^1.4.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/gafl-webapp-service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/gafl-webapp-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/gafl-webapp-service",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "The websales frontend for the GAFL service",
"type": "module",
"engines": {
Expand Down Expand Up @@ -36,8 +36,8 @@
"prepare": "gulp --gulpfile build/gulpfile.cjs"
},
"dependencies": {
"@defra-fish/business-rules-lib": "1.37.0-rc.1",
"@defra-fish/connectors-lib": "1.37.0-rc.1",
"@defra-fish/business-rules-lib": "1.37.0-rc.2",
"@defra-fish/connectors-lib": "1.37.0-rc.2",
"@defra/hapi-gapi": "^2.0.0",
"@hapi/boom": "^9.1.2",
"@hapi/catbox-redis": "^6.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/payment-mop-up-job/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/payment-mop-up-job/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/payment-mop-up-job",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Process incomplete web-sales",
"type": "module",
"engines": {
Expand Down Expand Up @@ -36,8 +36,8 @@
"test": "echo \"Error: run tests from root\" && exit 1"
},
"dependencies": {
"@defra-fish/business-rules-lib": "1.37.0-rc.1",
"@defra-fish/connectors-lib": "1.37.0-rc.1",
"@defra-fish/business-rules-lib": "1.37.0-rc.2",
"@defra-fish/connectors-lib": "1.37.0-rc.2",
"bottleneck": "^2.19.5",
"debug": "^4.3.3",
"moment": "^2.29.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/pocl-job/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/pocl-job/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/pocl-job",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Post Office Counter Licence sales processor",
"type": "module",
"engines": {
Expand Down Expand Up @@ -35,8 +35,8 @@
"test": "echo \"Error: run tests from root\" && exit 1"
},
"dependencies": {
"@defra-fish/business-rules-lib": "1.37.0-rc.1",
"@defra-fish/connectors-lib": "1.37.0-rc.1",
"@defra-fish/business-rules-lib": "1.37.0-rc.2",
"@defra-fish/connectors-lib": "1.37.0-rc.2",
"commander": "^7.2.0",
"debug": "^4.3.3",
"filesize": "^6.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/sales-api-service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/sales-api-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/sales-api-service",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "Rod Licensing Sales API",
"type": "module",
"engines": {
Expand Down Expand Up @@ -35,9 +35,9 @@
"test": "echo \"Error: run tests from root\" && exit 1"
},
"dependencies": {
"@defra-fish/business-rules-lib": "1.37.0-rc.1",
"@defra-fish/connectors-lib": "1.37.0-rc.1",
"@defra-fish/dynamics-lib": "1.37.0-rc.1",
"@defra-fish/business-rules-lib": "1.37.0-rc.2",
"@defra-fish/connectors-lib": "1.37.0-rc.2",
"@defra-fish/dynamics-lib": "1.37.0-rc.2",
"@hapi/boom": "^9.1.2",
"@hapi/hapi": "^20.1.3",
"@hapi/inert": "^6.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/sqs-receiver-service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/sqs-receiver-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@defra-fish/sqs-receiver-service",
"version": "1.37.0-rc.1",
"version": "1.37.0-rc.2",
"description": "SQS Receiver service",
"type": "module",
"engines": {
Expand Down Expand Up @@ -35,7 +35,7 @@
"test": "echo \"Error: run tests from root\" && exit 1"
},
"dependencies": {
"@defra-fish/connectors-lib": "1.37.0-rc.1",
"@defra-fish/connectors-lib": "1.37.0-rc.2",
"debug": "^4.3.1",
"joi": "^17.3.0",
"node-fetch": "^2.6.1",
Expand Down

0 comments on commit 65850f6

Please sign in to comment.