Skip to content

Commit

Permalink
Merge branch 'main' into scheduler-time-frame
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergify
mergify[bot] authored Dec 13, 2023
2 parents a56f918 + db22b85 commit 2f12a18
Show file tree
Hide file tree
Showing 20 changed files with 419 additions and 429 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^0.28.2",
"cdk-generate-synthetic-examples": "^0.1.298",
"cdk-generate-synthetic-examples": "^0.1.299",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.92.0",
"jsii-pacmak": "1.92.0",
"jsii-reflect": "1.92.0",
"jsii-rosetta": "~5.2.5",
"jsii-diff": "1.93.0",
"jsii-pacmak": "1.93.0",
"jsii-reflect": "1.93.0",
"jsii-rosetta": "~5.2.6",
"lerna": "^7.4.2",
"nx": "^16.10.0",
"patch-package": "^6.5.1",
"semver": "^7.5.4",
"standard-version": "^9.5.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "~5.1.6"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1513.0",
"aws-sdk": "^2.1517.0",
"axios": "^1.6.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/framework-integ/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1513.0",
"aws-sdk": "^2.1517.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "2.68.15",
"cdk8s-plus-27": "2.7.69",
"cdk8s": "2.68.18",
"cdk8s-plus-27": "2.7.70",
"constructs": "^10.0.0"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cli-lib-alpha/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"aws-cdk": "0.0.0",
"constructs": "^10.0.0",
"jest": "^29.7.0",
"ts-node": "^10.9.1"
"ts-node": "^10.9.2"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/custom-resource-handlers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
"sinon": "^9.2.4",
"nock": "^13.4.0",
"fs-extra": "^11.2.0",
"esbuild": "^0.19.8"
"esbuild": "^0.19.9"
},
"dependencies": {
"@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1",
"@aws-sdk/client-lambda": "3.421.0",
"@aws-sdk/client-synthetics": "3.421.0",
"@aws-sdk/client-ecr": "3.421.0",
"@aws-sdk/client-s3": "3.421.0",
"aws-sdk": "^2.1513.0"
"aws-sdk": "^2.1517.0"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"constructs": "^10.0.0",
"mock-fs": "^4.14.0",
"jest": "^29.7.0",
"ts-node": "^10.9.1"
"ts-node": "^10.9.2"
},
"dependencies": {
"chokidar": "^3.5.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk-lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@
"@types/lodash": "^4.14.202",
"@types/punycode": "^2.1.3",
"@aws-cdk/lazify": "0.0.0",
"aws-sdk": "^2.1513.0",
"aws-sdk": "^2.1517.0",
"aws-sdk-client-mock": "^3.0.0",
"aws-sdk-client-mock-jest": "^3.0.0",
"aws-sdk-mock": "5.8.0",
"cdk8s": "2.68.15",
"cdk8s": "2.68.18",
"constructs": "^10.0.0",
"delay": "5.0.0",
"esbuild": "^0.19.8",
"esbuild": "^0.19.9",
"fast-check": "^3.14.0",
"jest": "^29.7.0",
"jest-each": "^29.7.0",
Expand All @@ -179,7 +179,7 @@
"nock": "^13.4.0",
"sinon": "^9.2.4",
"ts-mock-imports": "^1.3.8",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "~5.1.6",
"typescript-json-schema": "^0.62.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/aws-cdk/THIRD_PARTY_LICENSES
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The aws-cdk package includes the following third-party software/licensing:

** @jsii/check-node@1.92.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.92.0 | Apache-2.0
** @jsii/check-node@1.93.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.93.0 | Apache-2.0
jsii
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down Expand Up @@ -264,7 +264,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

** aws-sdk@2.1513.0 - https://www.npmjs.com/package/aws-sdk/v/2.1513.0 | Apache-2.0
** aws-sdk@2.1517.0 - https://www.npmjs.com/package/aws-sdk/v/2.1517.0 | Apache-2.0
AWS SDK for JavaScript
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down Expand Up @@ -461,7 +461,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

----------------

** cdk-from-cfn@0.85.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.85.0 | MIT OR Apache-2.0
** cdk-from-cfn@0.91.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.91.0 | MIT OR Apache-2.0

----------------

Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/lib/init-templates/app/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
},
"devDependencies": {
"@types/jest": "^29.5.11",
"@types/node": "20.10.3",
"@types/node": "20.10.4",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"aws-cdk": "%cdk-version%",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "~5.3.3"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/lib/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@types/jest": "^29.5.11",
"@types/node": "20.10.3",
"@types/node": "20.10.4",
"aws-cdk-lib": "%cdk-version%",
"constructs": "%constructs-version%",
"jest": "^29.7.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
},
"devDependencies": {
"@types/jest": "^29.5.11",
"@types/node": "20.10.3",
"@types/node": "20.10.4",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"aws-cdk": "%cdk-version%",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "~5.3.3"
},
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/aws-cdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"@jsii/check-node": "1.92.0",
"@jsii/check-node": "1.93.0",
"archiver": "^5.3.2",
"aws-sdk": "^2.1513.0",
"aws-sdk": "^2.1517.0",
"camelcase": "^6.3.0",
"cdk-assets": "0.0.0",
"cdk-from-cfn": "^0.85.0",
"cdk-from-cfn": "^0.91.0",
"chalk": "^4",
"chokidar": "^3.5.3",
"decamelize": "^5.0.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/awslint/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"awslint": "bin/awslint"
},
"dependencies": {
"@jsii/spec": "1.92.0",
"@jsii/spec": "1.93.0",
"chalk": "^4",
"fs-extra": "^9.1.0",
"jsii-reflect": "1.92.0",
"jsii-reflect": "1.93.0",
"change-case": "^4.1.2",
"yargs": "^16.2.0"
},
Expand All @@ -31,8 +31,8 @@
"@types/fs-extra": "^9.0.13",
"@types/jest": "^29.5.11",
"@types/yargs": "^15.0.19",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"eslint": "^7.32.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^2.7.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk-assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"archiver": "^5.3.2",
"aws-sdk": "^2.1513.0",
"aws-sdk": "^2.1517.0",
"glob": "^7.2.3",
"mime": "^2.6.0",
"yargs": "^16.2.0"
Expand Down
12 changes: 6 additions & 6 deletions tools/@aws-cdk/cdk-build-tools/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@aws-cdk/eslint-plugin": "0.0.0",
"@aws-cdk/yarn-cling": "0.0.0",
"@aws-cdk/node-bundle": "0.0.0",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"awslint": "0.0.0",
"chalk": "^4",
"eslint": "^7.32.0",
Expand All @@ -60,10 +60,10 @@
"glob": "^7.2.3",
"jest": "^29.7.0",
"jest-junit": "^13.2.0",
"jsii": "~5.2.38",
"jsii-pacmak": "1.92.0",
"jsii-reflect": "1.92.0",
"markdownlint-cli": "^0.37.0",
"jsii": "~5.2.41",
"jsii-pacmak": "1.93.0",
"jsii-reflect": "1.93.0",
"markdownlint-cli": "^0.38.0",
"nyc": "^15.1.0",
"semver": "^7.5.4",
"ts-jest": "^29.1.1",
Expand Down
2 changes: 1 addition & 1 deletion tools/@aws-cdk/eslint-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"typescript": "~5.1.6"
},
"dependencies": {
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/parser": "^6.14.0",
"eslint": "^7.32.0",
"fs-extra": "^9.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion tools/@aws-cdk/lazify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"cjs-module-lexer": "^1.2.3"
},
"dependencies": {
"esbuild": "^0.19.8",
"esbuild": "^0.19.9",
"fs-extra": "^10.1.0",
"yargs": "^17.7.2"
},
Expand Down
6 changes: 3 additions & 3 deletions tools/@aws-cdk/node-bundle/package.json
View file

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

4 changes: 2 additions & 2 deletions tools/@aws-cdk/pkglint/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@types/jest": "^29.5.11",
"@types/semver": "^7.5.6",
"@types/yargs": "^15.0.19",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"eslint": "^7.32.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^2.7.1",
Expand Down
Loading

0 comments on commit 2f12a18

Please sign in to comment.