From 24b2954845df3abba03c4df79a3a6eac7b26fbb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 09:07:57 +0000 Subject: [PATCH 01/12] chore(deps): Bump golang.org/x/tools from 0.9.2 to 0.9.3 in /packages/@jsii/go-runtime-test/project (#4128) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.9.2 to 0.9.3.
Release notes

Sourced from golang.org/x/tools's releases.

gopls/v0.9.3

Move fast and fix things...golang/go#54395

As always, thank you for filing issues!

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/tools&package-manager=go_modules&previous-version=0.9.2&new-version=0.9.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/go-runtime-test/project/go.mod | 2 +- packages/@jsii/go-runtime-test/project/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/packages/@jsii/go-runtime-test/project/go.mod index 34739325d5..31983b534b 100644 --- a/packages/@jsii/go-runtime-test/project/go.mod +++ b/packages/@jsii/go-runtime-test/project/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview github.com/stretchr/testify v1.8.4 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/tools v0.9.2 + golang.org/x/tools v0.9.3 ) require ( diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum index 1613f34dc1..7a67a8309a 100644 --- a/packages/@jsii/go-runtime-test/project/go.sum +++ b/packages/@jsii/go-runtime-test/project/go.sum @@ -48,6 +48,8 @@ golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc= golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From db3f3bc86d07c92807cc4262d1c5e2c5548ec610 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 12:46:19 +0000 Subject: [PATCH 02/12] chore(deps): Bump Microsoft.NET.Test.Sdk from 17.6.0 to 17.6.1 in /packages/@jsii/dotnet-runtime-test/test (#4129) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.0 to 17.6.1.
Release notes

Sourced from Microsoft.NET.Test.Sdk's releases.

v17.6.1

Issues Fixed

This is a tiny patch to fixup few latest issues,

Internal updates:

Full Changelog: https://github.com/microsoft/vstest/compare/v17.6.0...v17.6.1

Artifacts

Changelog

Sourced from Microsoft.NET.Test.Sdk's changelog.

17.6.1 and newer

Please see release notes directly in the release page: https://github.com/microsoft/vstest/releases

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Microsoft.NET.Test.Sdk&package-manager=nuget&previous-version=17.6.0&new-version=17.6.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index 00a5f96727..f6481a5573 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -10,7 +10,7 @@ - + From e3834c32de4138387850901313fc5899315e4972 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 15:21:18 +0000 Subject: [PATCH 03/12] chore(deps-dev): Update mkdocs-material requirement from ~=9.1.14 to ~=9.1.15 in /gh-pages (#4131) Updates the requirements on [mkdocs-material](https://github.com/squidfunk/mkdocs-material) to permit the latest version.
Release notes

Sourced from mkdocs-material's releases.

mkdocs-material-9.1.15

  • Fixed #5566: Indicate color scheme to operating system
  • Fixed #5565: Update Dockerfile to latest version of base image
  • Fixed #5554: Add additional version tags (9, 9.1) to Docker image
  • Fixed #5536: Strip tags of ARIA labels in table of contents
Changelog

Sourced from mkdocs-material's changelog.

mkdocs-material-9.1.15+insiders-4.35.3 (2023-06-01)

  • Fixed #5579: Abbreviations in headlines filtered by typeset plugin

mkdocs-material-9.1.15+insiders-4.35.2 (2023-05-29)

  • Fixed #5555: Blog plugin crashes when computing readtime for emojis

mkdocs-material-9.1.15 (2023-05-29)

  • Fixed #5566: Indicate color scheme to operating system
  • Fixed #5565: Update Dockerfile to latest version of base image
  • Fixed #5554: Add additional version tags (9, 9.1) to Docker image
  • Fixed #5536: Strip tags of ARIA labels in table of contents

mkdocs-material-9.1.14+insiders-4.35.1 (2023-05-20)

  • Fixed internal handling of errors in social plugin

mkdocs-material-9.1.14+insiders-4.35.0 (2023-05-20)

  • Improve editing experience and stability of social plugin
  • Added support for custom layout syntax validation in social plugin
  • Added support for layer origin for easier placement in social plugin
  • Added support for in- and exclusion patterns in social plugin
  • Catch and print syntax errors in custom layouts

mkdocs-material-9.1.14 (2023-05-20)

  • Updated Armenian and Greek translations

mkdocs-material-9.1.13+insiders-4.34.1 (2023-05-16)

  • Disable social plugin debug mode by default on mkdocs build
  • Added warning in social plugin debug mode when font style couldn't be found
  • Set default concurrency of built-in multi-threaded plugins to CPUs - 1
  • Fixed #5521: Social plugin triggers race condition when downloading fonts
  • Fixed #5515: Social plugin crashes when concurrency is set to 1

mkdocs-material-9.1.13 (2023-05-16)

  • Fixed #5517: Social plugin crashes for some fonts (e.g. Open Sans)

mkdocs-material-9.1.12+insiders-4.34.0 (2023-05-14)

  • Added support for new overflow mode to auto-fit text in social plugin
  • Reduced subtle rendering bugs in (code) annotations due to subpixel rounding
  • Improved print styles for (code) annotation lists
  • Improved performance of social plugin, now 3x as fast
  • Improved interop of typeset plugin with MkDocstrings

... (truncated)

Commits
  • 06d1ba1 Prepare 9.1.15 release
  • 3d70640 Updated dependencies
  • 0f1866b Documentation
  • aa4befa Merge branch 'master' of github.com:squidfunk/mkdocs-material
  • fe0c966 Added color-scheme property to indicate color scheme to OS
  • 2fa92de Merge pull request #5565 from yubiuser/update_docker
  • 7c19f46 Only user major.minor for python version
  • f37702a Added major.minor and major tags to Docker image
  • e0b3022 Update Dockerfile to latest alpine
  • f84725d Added tutorial on building custom social cards
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- gh-pages/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index ec873b247d..3a463aa54b 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ mkdocs~=1.4.3 mkdocs-awesome-pages-plugin~=2.9.1 -mkdocs-material~=9.1.14 +mkdocs-material~=9.1.15 mkdocs-git-revision-date-plugin~=0.3.2 From 98b7b4c0024d84edd05cc0a7764e858bee5b39eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:57:21 +0000 Subject: [PATCH 04/12] chore(deps): Update cattrs requirement from <22.3,>=1.8 to >=1.8,<23.2 in /packages/@jsii/python-runtime (#4130) Updates the requirements on [cattrs](https://github.com/python-attrs/cattrs) to permit the latest version.
Changelog

Sourced from cattrs's changelog.

23.1.2 (2023-06-02)

  • Improve typing_extensions version bound. (#372)

23.1.1 (2023-05-30)

  • Add typing_extensions as a direct dependency on 3.10. (#369 #370)

23.1.0 (2023-05-30)

  • Introduce the tagged_union strategy. (#318 #317)
  • Introduce the cattrs.transform_error helper function for formatting validation exceptions. (258 342)
  • Add support for typing.TypedDict and typing_extensions.TypedDict. (#296 #364)
  • Add support for typing.Final. (#340 #349)
  • Introduce override.struct_hook and override.unstruct_hook. Learn more here. (#326)
  • Fix generating structuring functions for types with angle brackets (<>) and pipe symbols (|) in the name. (#319 #327)
  • pathlib.Path is now supported by default. (#81)
  • Add cbor2 serialization library to the cattr.preconf package.
  • Add optional dependencies for cattrs.preconf third-party libraries. (#337)
  • All preconf converters now allow overriding the default unstruct_collection_overrides in make_converter. (#350 #353)
  • Subclasses structuring and unstructuring is now supported via a custom include_subclasses strategy. (#312)
  • Add support for typing_extensions.Annotated when the python version is less than 3.9. (#366)
  • Add unstructuring and structuring support for the standard library deque. (#355)

22.2.0 (2022-10-03)

  • Potentially breaking: cattrs.Converter has been renamed to cattrs.BaseConverter, and cattrs.GenConverter to cattrs.Converter. The GenConverter name is still available for backwards compatibility, but is deprecated. If you were depending on functionality specific to the old Converter, change your import to from cattrs import BaseConverter.
  • NewTypes are now supported by the cattrs.Converter. (#255 #94 #297)
  • cattrs.Converter and cattrs.BaseConverter can now copy themselves using the copy method. (#284)
  • Python 3.11 support.
  • cattrs now supports un/structuring kw_only fields on attrs classes into/from dictionaries. (#247)
  • PyPy support (and tests, using a minimal Hypothesis profile) restored. (#253)
  • Fix propagating the detailed_validation flag to mapping and counter structuring generators.
  • Fix typing.Set applying too broadly when used with the GenConverter.unstruct_collection_overrides parameter on Python versions below 3.9. Switch to typing.AbstractSet on those versions to restore the old behavior. (#264)
  • Uncap the required Python version, to avoid problems detailed here (#275)
  • Fix Converter.register_structure_hook_factory and cattrs.gen.make_dict_unstructure_fn type annotations.

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/python-runtime/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/setup.py b/packages/@jsii/python-runtime/setup.py index 6a56e5e4c9..5ae79af4b7 100644 --- a/packages/@jsii/python-runtime/setup.py +++ b/packages/@jsii/python-runtime/setup.py @@ -31,7 +31,7 @@ }, install_requires=[ "attrs>=21.2,<24.0", - "cattrs>=1.8,<22.3", + "cattrs>=1.8,<23.2", "importlib_resources>=5.2.0", "publication>=0.0.3", # This is used by all generated code. "typeguard~=2.13.3", # This is used by all generated code. From 99da2784c0313a62fad7f840879d67925bb0bea6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 20:02:03 +0000 Subject: [PATCH 05/12] chore(deps): Bump github.com/mattn/go-isatty from 0.0.18 to 0.0.19 in /packages/@jsii/go-runtime/jsii-runtime-go (#4113) Bumps [github.com/mattn/go-isatty](https://github.com/mattn/go-isatty) from 0.0.18 to 0.0.19.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/mattn/go-isatty&package-manager=go_modules&previous-version=0.0.18&new-version=0.0.19)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/go-runtime-test/project/go.mod | 3 +-- packages/@jsii/go-runtime-test/project/go.sum | 25 ++----------------- .../@jsii/go-runtime/jsii-runtime-go/go.mod | 2 +- .../@jsii/go-runtime/jsii-runtime-go/go.sum | 4 +-- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/packages/@jsii/go-runtime-test/project/go.mod index 31983b534b..bfd67746da 100644 --- a/packages/@jsii/go-runtime-test/project/go.mod +++ b/packages/@jsii/go-runtime-test/project/go.mod @@ -16,9 +16,8 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.5.0 // indirect github.com/yuin/goldmark v1.4.13 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/sys v0.8.0 // indirect diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum index 7a67a8309a..b43894d38d 100644 --- a/packages/@jsii/go-runtime-test/project/go.sum +++ b/packages/@jsii/go-runtime-test/project/go.sum @@ -1,22 +1,11 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= @@ -31,28 +20,18 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= -golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc= -golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod index 66f8ffce64..8be2e802fe 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod +++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/mattn/go-isatty v0.0.18 + github.com/mattn/go-isatty v0.0.19 github.com/stretchr/testify v1.8.4 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/tools v0.9.1 diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum index b68e519d58..6aa7348eeb 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum +++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum @@ -2,8 +2,8 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= From 1bf8f79216416209dc36261d83fe26df4d6da838 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:02:39 +0000 Subject: [PATCH 06/12] chore(deps): Bump golang.org/x/tools from 0.9.1 to 0.9.3 in /packages/@jsii/go-runtime/jsii-runtime-go (#4127) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.9.1 to 0.9.3.
Release notes

Sourced from golang.org/x/tools's releases.

gopls/v0.9.3

Move fast and fix things...golang/go#54395

As always, thank you for filing issues!

gopls/v0.9.2

This release contains many bug fixes, particularly related to problems that would require restarting gopls.

Note about network usage: among these fixes was a change to allow network usage when reloading the workspace. Reloading occurs when a go.mod, go.sum, or go.work file changes on disk. In the past, gopls would only allow network during the first workspace load. This resulted in confusing behavior when, for example, a new dependency is added to a go.mod file and gopls could not load it, but loading succeeded on restart. See #54069 for more details.

Configuration changes

directoryFilters at arbitrary depth

The "directoryFilters" setting now supports excluding directories at arbitrary depth, using the ** operator. (note that for v0.9.2, the default value for this setting is still ["-node_modules]". In the next release, this will change to ["-**/node_modules"]).

Bug fixes and Performance improvements...

This release contains the following notable bug fixes / performance improvements:

  • Additional change optimization - Following up on the work to optimize change processing from the v0.9.0 release, this release contains additional optimizations that result in around 50% faster change processing (measured via edits in the Kubernetes repo).
  • Fix for a long-standing memory leak - #53780 fixed a long-standing bug that caused gopls to hold on to its initial state, gradually leaking memory as state changed during the editing session.
  • Fewer restarts - This release contains many fixes for cache-invalidation bugs that would cause gopls to get confused and require restarting. Additionally, see the note at top about enabling the network when reloading the workspace. We believe we are close to our goal that restarting gopls should never be required to fix workspace errors. If you encounter such a bug, please file an issue!

A full list of all issues fixed can be found in the gopls/v0.9.2 milestone. To report a new problem, please file a new issue at https://go.dev/issues/new.

Thank you to our contributors!

Thank you for your contribution, @​alandonovan, @​antoineco, @​dle8, @​euroelessar, @​findleyr, @​hyangah, @​jamalc, @​mssdvd, @​pjweinbgo, @​rentziass, and @​suzmue!

What's next

The next planned gopls release is v0.10.0. We’re excited about features and improvements on the horizon, for example:

  • Package renaming (#41567)
  • More accurate static-analysis (#48738)
  • Improved support for the new 1.19 doc comment format (#54260)
  • Making it easier to work with go.work files (many issues, for example #53880 or #54261)
Commits
  • 0dda7d6 go/pointer: remove replace directive
  • 98f1b4d gopls/internal/lsp/cache: check number of orphaned files after filtering
  • a260315 go/pointer: create submodule
  • 96844c3 cmd/{guru,callgraph}: stop using go/pointer
  • cd694d8 go/packages: include "unsafe".GoFiles=["unsafe.go"]
  • 33c741d gopls/internal/lsp: add min/max builtin
  • 933c7cc internal/lsp/source: use exact match in import highlighting
  • 5974258 gopls/internal/lsp: clear vuln diagnostics on config changes
  • f3faea1 go/packages: pass -pgo=off on go1.21 and later
  • 5f74ec7 internal/lsp/debug: add links to profiles and GC
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/tools&package-manager=go_modules&previous-version=0.9.1&new-version=0.9.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/go-runtime/jsii-runtime-go/go.mod | 2 +- packages/@jsii/go-runtime/jsii-runtime-go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod index 8be2e802fe..c557a2c3cb 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod +++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod @@ -7,7 +7,7 @@ require ( github.com/mattn/go-isatty v0.0.19 github.com/stretchr/testify v1.8.4 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/tools v0.9.1 + golang.org/x/tools v0.9.3 ) require ( diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum index 6aa7348eeb..b43894d38d 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum +++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum @@ -28,8 +28,8 @@ golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From f880d503c2a51a4ea47145f6a3da43e74a52f0cb Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Thu, 8 Jun 2023 17:31:37 +0200 Subject: [PATCH 07/12] chore: test for Node 20, set default to node 16 (#4126) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .github/workflows/docker-images.yml | 51 +++-------- .github/workflows/main.yml | 69 ++++++++------- .github/workflows/yarn-upgrade.yml | 8 +- .mergify/config.yml | 84 +------------------ .../@fixtures/jsii-calc-bundled/package.json | 2 +- packages/@jsii/check-node/package.json | 2 +- packages/@jsii/check-node/src/constants.ts | 12 +-- .../@jsii/dotnet-runtime-test/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/@jsii/java-runtime-test/package.json | 2 +- packages/@jsii/java-runtime-test/pom.xml.t.js | 8 +- packages/@jsii/java-runtime/package.json | 2 +- packages/@jsii/java-runtime/pom.xml.t.js | 14 ++-- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/python-runtime/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- .../jsii-calc-base-of-base/package.json | 2 +- packages/@scope/jsii-calc-base/package.json | 2 +- packages/@scope/jsii-calc-lib/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/bin/jsii-pacmak.ts | 1 + packages/jsii-pacmak/lib/targets/java.ts | 19 +++-- packages/jsii-pacmak/package.json | 2 +- .../__snapshots__/examples.test.js.snap | 28 ++++--- .../prerelease-identifiers.test.js.snap | 56 +++++++------ .../__snapshots__/target-java.test.js.snap | 56 +++++++------ packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- tools/jsii-build-tools/package.json | 2 +- 34 files changed, 192 insertions(+), 258 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 37106b666a..63fc9458ef 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -18,11 +18,12 @@ jobs: id-token: write # Necessary for OIDC federation runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - node: ['14', '16', '18'] + node: ['14', '16', '18', '20'] env: # Node version whose images will be aliased without the -nodeXX segment - DEFAULT_NODE_MAJOR_VERSION: 14 + DEFAULT_NODE_MAJOR_VERSION: 16 steps: - name: Check out uses: actions/checkout@v3 @@ -33,10 +34,10 @@ jobs: run: |- if [ "${{ github.event_name }}" = "push" ]; then echo '⏯ Triggered by "push" event' - echo "::set-output name=result::true" + echo "result=true" >> $GITHUB_OUTPUT elif [ "${{ github.base_ref }}" = "release" ]; then echo '⏯ Triggered by "pull_request" event against "release"' - echo "::set-output name=result::true" + echo "result=true" >> $GITHUB_OUTPUT else # Fetch the base and head refs from origin so we can safely diff 'em git fetch --depth=1 --quiet origin ${{ github.base_ref }} @@ -44,14 +45,14 @@ jobs: changed=$(git diff --name-only origin/${{ github.base_ref }}..HEAD) if grep Dockerfile <<< "${changed}" ; then echo '⏯ Dockerfile changed' - echo "::set-output name=result::true" + echo "result=true" >> $GITHUB_OUTPUT else if grep '.github/workflows/docker-images.yml' <<< "${changed}" ; then echo '⏯ docker-images workflow changed' - echo "::set-output name=result::true" + echo "result=true" >> $GITHUB_OUTPUT else echo '⏭ Dockerfile not changed' - echo "::set-output name=result::false" + echo "result=false" >> $GITHUB_OUTPUT fi fi fi @@ -65,10 +66,10 @@ jobs: run: |- if [[ "${{ secrets.AWS_ROLE_TO_ASSUME }}" != "" ]]; then echo "🔑 Federation into AWS is possible (AWS_ROLE_TO_ASSUME is available)" - echo "::set-output name=enabled::true" + echo "enabled=true" >> $GITHUB_OUTPUT else echo "❌ Federation into AWS is disabled (no AWS_ROLE_TO_ASSUME secret found)" - echo "::set-output name=enabled::false" + echo "enabled=false" >> $GITHUB_OUTPUT fi # Federate into the PR Validation AWS Account @@ -114,17 +115,6 @@ jobs: [worker.oci] max-parallelism = 1 - # We only restore GH cache if we are not going to publish the result (i.e: PR validation) - - name: Set up layer cache - if: steps.should-run.outputs.result == 'true' && github.event_name != 'push' - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ hashFiles('superchain/*') }}-${{ github.sha }} - restore-keys: |- - ${{ runner.os }}-buildx-${{ hashFiles('superchain/*') }}- - ${{ runner.os }}-buildx- - # 1 pull per second from ECR Public - name: Jitter the start time to avoid ECR Public throttling id: sleep-start @@ -136,7 +126,7 @@ jobs: id: build-time if: steps.should-run.outputs.result == 'true' run: |- - echo "::set-output name=value::$(date -u +'%Y-%m-%dT%H:%M:%SZ')" + echo "value=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - name: Build Image if: steps.should-run.outputs.result == 'true' @@ -145,8 +135,6 @@ jobs: --builder ${{ steps.buildx.outputs.name }} \ --platform linux/amd64,linux/arm64 \ --target superchain \ - --cache-from type=local,src=/tmp/.buildx-cache \ - --cache-to type=local,dest=/tmp/.buildx-cache-out \ --pull \ --build-arg BUILD_TIMESTAMP="${{ steps.build-time.outputs.value }}" \ --build-arg COMMIT_ID='${{ github.sha }}' \ @@ -161,8 +149,6 @@ jobs: --builder ${{ steps.buildx.outputs.name }} \ --platform linux/amd64,linux/arm64 \ --target superchain \ - --cache-from type=local,src=/tmp/.buildx-cache \ - --cache-to type=local,dest=/tmp/.buildx-cache \ --build-arg BUILD_TIMESTAMP="${{ steps.build-time.outputs.value }}" \ --build-arg COMMIT_ID='${{ github.sha }}' \ --build-arg NODE_MAJOR_VERSION=${{ matrix.node }} \ @@ -194,8 +180,6 @@ jobs: --builder ${{ steps.buildx.outputs.name }} \ --platform linux/amd64,linux/arm64 \ --target superchain \ - --cache-from type=local,src=/tmp/.buildx-cache \ - --cache-to type=local,dest=/tmp/.buildx-cache \ --push \ --build-arg BUILD_TIMESTAMP="${{ steps.build-time.outputs.value }}" \ --build-arg COMMIT_ID='${{ github.sha }}' \ @@ -211,8 +195,6 @@ jobs: --builder ${{ steps.buildx.outputs.name }} \ --platform linux/amd64,linux/arm64 \ --target superchain \ - --cache-from type=local,src=/tmp/.buildx-cache \ - --cache-to type=local,dest=/tmp/.buildx-cache \ --push \ --build-arg BUILD_TIMESTAMP="${{ steps.build-time.outputs.value }}" \ --build-arg COMMIT_ID='${{ github.sha }}' \ @@ -233,8 +215,6 @@ jobs: --builder ${{ steps.buildx.outputs.name }} \ --platform linux/amd64,linux/arm64 \ --target superchain \ - --cache-from type=local,src=/tmp/.buildx-cache \ - --cache-to type=local,dest=/tmp/.buildx-cache \ --push \ --build-arg BUILD_TIMESTAMP="${{ steps.build-time.outputs.value }}" \ --build-arg COMMIT_ID='${{ github.sha }}' \ @@ -250,8 +230,6 @@ jobs: --builder ${{ steps.buildx.outputs.name }} \ --platform linux/amd64,linux/arm64 \ --target superchain \ - --cache-from type=local,src=/tmp/.buildx-cache \ - --cache-to type=local,dest=/tmp/.buildx-cache \ --push \ --build-arg BUILD_TIMESTAMP="${{ steps.build-time.outputs.value }}" \ --build-arg COMMIT_ID='${{ github.sha }}' \ @@ -261,10 +239,3 @@ jobs: -f superchain/Dockerfile \ . fi - - # Replace the cache so it does not grow forever (should always be last!) - - name: Update layer cache - if: always() && steps.should-run.outputs.result == 'true' - run: |- - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-out /tmp/.buildx-cache diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41f6fe4072..533fb0f9ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,11 +41,11 @@ jobs: with: distribution: 'zulu' java-version: '8' - - name: Set up Node 14 + - name: Set up Node 16 uses: actions/setup-node@v3 with: cache: yarn - node-version: '14' + node-version: '16' - name: Set up Python 3.7 uses: actions/setup-python@v4 with: @@ -124,11 +124,11 @@ jobs: with: distribution: 'zulu' java-version: '8' - - name: Set up Node 14 + - name: Set up Node 16 uses: actions/setup-node@v3 with: cache: yarn - node-version: '14' + node-version: '16' - name: Set up Python 3.7 uses: actions/setup-python@v4 with: @@ -194,7 +194,7 @@ jobs: dotnet: ['6.0.x'] go: ['1.18'] java: ['8'] - node: ['14'] # EOL 2023-04-30 + node: ['16'] # EOL 2023-09-11 os: [ubuntu-latest] python: ['3.7'] # Add specific combinations to be tested against "node 14" (to restrict cardinality) @@ -205,7 +205,7 @@ jobs: dotnet: '6.0.x' go: '1.18' java: '8' - node: '14' + node: '16' python: '3.7' # Test using macOS - title: 'macOS' @@ -213,7 +213,7 @@ jobs: dotnet: '6.0.x' go: '1.18' java: '8' - node: '14' + node: '16' python: '3.7' # Test alternate Nodes - title: 'Node 16' @@ -230,11 +230,11 @@ jobs: node: '18' # EOL 2025-04-30 os: ubuntu-latest python: '3.7' - - title: 'Node 19' + - title: 'Node 20' java: '8' dotnet: '6.0.x' go: '1.18' - node: '19' # EOL 2023-06-01 + node: '20' # EOL 2026-04-30 os: ubuntu-latest python: '3.7' # Test alternate .NETs @@ -242,7 +242,7 @@ jobs: java: '8' dotnet: '7.0.x' go: '1.18' - node: '14' + node: '16' os: ubuntu-latest python: '3.7' # Test alternate Gos @@ -250,7 +250,7 @@ jobs: java: '8' dotnet: '6.0.x' go: '1.19' - node: '14' + node: '16' os: ubuntu-latest python: '3.7' # Test alternate Javas @@ -258,7 +258,7 @@ jobs: java: '11' dotnet: '6.0.x' go: '1.18' - node: '14' + node: '16' os: ubuntu-latest python: '3.7' # Test alternate Pythons @@ -267,28 +267,28 @@ jobs: dotnet: '6.0.x' go: '1.18' java: '8' - node: '14' + node: '16' os: ubuntu-latest - title: 'Python 3.9' python: '3.9' dotnet: '6.0.x' go: '1.18' java: '8' - node: '14' + node: '16' os: ubuntu-latest - title: 'Python 3.10' python: '3.10' dotnet: '6.0.x' go: '1.18' java: '8' - node: '14' + node: '16' os: ubuntu-latest - title: 'Python 3.11' python: '3.11' dotnet: '6.0.x' go: '1.18' java: '8' - node: '14' + node: '16' os: ubuntu-latest runs-on: ${{ matrix.os }} @@ -365,6 +365,16 @@ jobs: && echo "Untracked files: ${untracked:-}" \ && test -z "${untracked}" shell: bash + + test-ok: + name: Unit Tests + runs-on: ubuntu-latest + needs: test + steps: + - name: OK + # This is just a join target to simplify branch protection setup + run: echo OK + benchmark: name: Run benchmark suite runs-on: ubuntu-latest @@ -427,27 +437,27 @@ jobs: name: release-package path: ${{ runner.temp }}/release-package # Set up all of our standard runtimes - - name: Set up .NET 6 + - name: Set up .NET 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: '6.0.x' - - name: Set up Go 1.18 + dotnet-version: '7.0.x' + - name: Set up Go 1.20 uses: actions/setup-go@v4 with: - go-version: '1.18' - - name: Set up Java 8 + go-version: '1.20' + - name: Set up Java 20 uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '8' - - name: Set up Node 14 + distribution: 'corretto' + java-version: '20' + - name: Set up Node 20 uses: actions/setup-node@v3 with: - node-version: '14' - - name: Set up Python 3.7 + node-version: '20' + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: '3.7' + python-version: '3.11' - name: Install python3-venv run: sudo apt install -y python3-venv # Show time! @@ -457,8 +467,11 @@ jobs: ${{ runner.temp }}/release-package/js/*.tgz \ ${{ runner.temp }}/release-package/private/*.tgz - name: Run jsii-pacmak on aws-cdk-lib + env: + NODE_OPTIONS: --max-old-space-size=6144 + # We run with --no-parallel to avoid running out of memory... run: |- - ./node_modules/.bin/jsii-pacmak ./node_modules/aws-cdk-lib + ./node_modules/.bin/jsii-pacmak --no-parallel ./node_modules/aws-cdk-lib # Upload artifact (we'll tar it up to save time) - name: 'Upload Artifact: integtest_aws-cdk-lib' uses: actions/upload-artifact@v3 diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml index f2532cc440..2c32186f33 100644 --- a/.github/workflows/yarn-upgrade.yml +++ b/.github/workflows/yarn-upgrade.yml @@ -31,8 +31,8 @@ jobs: id: monorepo-packages # These need to be ignored from the `ncu` runs! run: |- - echo -n "::set-output name=list::" - node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')" + echo -n "list=" >> $GITHUB_OUTPUT + node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')" >> $GITHUB_OUTPUT - name: Identify production dependencies id: production-dependencies @@ -40,8 +40,8 @@ jobs: # We assume repository-root has no production dependencies (it shouldn't have any!) # We always consider @types/node to be a production dependency (it must relate to our minimum supported engine) run: |- - echo -n "::set-output name=list::" - node -p <<-EOF + echo -n "list=" >> $GITHUB_OUTPUT + node -p <<-EOF >> $GITHUB_OUTPUT const path = require('path'); const prodDependencies = new Set(['@types/node']); diff --git a/.mergify/config.yml b/.mergify/config.yml index 10589c076f..db380e1c13 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -3,26 +3,7 @@ queue_rules: - name: default conditions: - status-success~=^jsii/superchain - # The baseline (Ubuntu + Min-supported SDKs and runtimes) - - status-success=Test (baseline) - # One test for each OS - - status-success=Test (macOS) - - status-success=Test (Windows) - # One test for each alternate nodejs version - - status-success=Test (Node 16) - - status-success=Test (Node 18) - - status-success=Test (Node 19) - # One test for each alternate .NET version - - status-success=Test (.NET 7.0) - # One test for each alternate go version - - status-success=Test (Go 1.19) - # One test for each alternate Java version - - status-success=Test (Java 11) - # One test for each alternate Python version - - status-success=Test (Python 3.8) - - status-success=Test (Python 3.9) - - status-success=Test (Python 3.10) - - status-success=Test (Python 3.11) + - status-success=Unit Tests pull_request_rules: - name: label core @@ -53,26 +34,7 @@ pull_request_rules: - status-success=Validate PR Title # Docker image validation - status-success~=^jsii/superchain - # The baseline (Ubuntu + Min-supported SDKs and runtimes) - - status-success=Test (baseline) - # One test for each OS - - status-success=Test (macOS) - - status-success=Test (Windows) - # One test for each alternate nodejs version - - status-success=Test (Node 16) - - status-success=Test (Node 18) - - status-success=Test (Node 19) - # One test for each alternate .NET version - - status-success=Test (.NET 7.0) - # One test for each alternate go version - - status-success=Test (Go 1.19) - # One test for each alternate Java version - - status-success=Test (Java 11) - # One test for each alternate Python version - - status-success=Test (Python 3.8) - - status-success=Test (Python 3.9) - - status-success=Test (Python 3.10) - - status-success=Test (Python 3.11) + - status-success=Unit Tests - name: Synchronize that PR to upstream and merge it (squash) actions: @@ -103,26 +65,7 @@ pull_request_rules: - status-success=Validate PR Title # Docker image validation - status-success~=^jsii/superchain - # The baseline (Ubuntu + Min-supported SDKs and runtimes) - - status-success=Test (baseline) - # One test for each OS - - status-success=Test (macOS) - - status-success=Test (Windows) - # One test for each alternate nodejs version - - status-success=Test (Node 16) - - status-success=Test (Node 18) - - status-success=Test (Node 19) - # One test for each alternate .NET version - - status-success=Test (.NET 7.0) - # One test for each alternate go version - - status-success=Test (Go 1.19) - # One test for each alternate Java version - - status-success=Test (Java 11) - # One test for each alternate Python version - - status-success=Test (Python 3.8) - - status-success=Test (Python 3.9) - - status-success=Test (Python 3.10) - - status-success=Test (Python 3.11) + - status-success=Unit Tests - name: Synchronize that PR to upstream and merge it (no-squash) actions: @@ -153,26 +96,7 @@ pull_request_rules: - status-success=Validate PR Title # Docker image validation - status-success~=^jsii/superchain - # The baseline (Ubuntu + Min-supported SDKs and runtimes) - - status-success=Test (baseline) - # One test for each OS - - status-success=Test (macOS) - - status-success=Test (Windows) - # One test for each alternate nodejs version - - status-success=Test (Node 16) - - status-success=Test (Node 18) - - status-success=Test (Node 19) - # One test for each alternate .NET version - - status-success=Test (.NET 7.0) - # One test for each alternate go version - - status-success=Test (Go 1.19) - # One test for each alternate Java version - - status-success=Test (Java 11) - # One test for each alternate Python version - - status-success=Test (Python 3.8) - - status-success=Test (Python 3.9) - - status-success=Test (Python 3.10) - - status-success=Test (Python 3.11) + - status-success=Unit Tests - name: Clean branch up actions: diff --git a/packages/@fixtures/jsii-calc-bundled/package.json b/packages/@fixtures/jsii-calc-bundled/package.json index e07c358a93..cf1bed62e7 100644 --- a/packages/@fixtures/jsii-calc-bundled/package.json +++ b/packages/@fixtures/jsii-calc-bundled/package.json @@ -17,7 +17,7 @@ "directory": "packages/@fixtures/jsii-calc-bundled" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "index.js" } diff --git a/packages/@jsii/check-node/package.json b/packages/@jsii/check-node/package.json index f715048683..c46a7c4fd4 100644 --- a/packages/@jsii/check-node/package.json +++ b/packages/@jsii/check-node/package.json @@ -17,7 +17,7 @@ "directory": "packages/@jsii/check-node" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/check-node/src/constants.ts b/packages/@jsii/check-node/src/constants.ts index a9491e2a41..a267bc0b20 100644 --- a/packages/@jsii/check-node/src/constants.ts +++ b/packages/@jsii/check-node/src/constants.ts @@ -26,17 +26,18 @@ export class NodeRelease { // Past end-of-life releases new NodeRelease(13, { endOfLife: new Date('2020-06-01') }), + new NodeRelease(14, { + endOfLife: new Date('2023-04-30'), + supportedRange: '^14.17.0', + }), new NodeRelease(15, { endOfLife: new Date('2021-06-01') }), new NodeRelease(12, { endOfLife: new Date('2022-04-30'), supportedRange: '^12.7.0', }), + new NodeRelease(19, { endOfLife: new Date('2023-06-01') }), // Currently active releases (as of last edit to this file...) - new NodeRelease(14, { - endOfLife: new Date('2023-04-30'), - supportedRange: '^14.6.0', - }), new NodeRelease(16, { endOfLife: new Date('2023-09-11'), supportedRange: '^16.3.0', @@ -46,10 +47,9 @@ export class NodeRelease { supportedRange: '^17.3.0', }), new NodeRelease(18, { endOfLife: new Date('2025-04-30') }), - new NodeRelease(19, { endOfLife: new Date('2023-06-01') }), + new NodeRelease(20, { endOfLife: new Date('2026-04-30') }), // Future (planned releases) - new NodeRelease(20, { endOfLife: new Date('2026-04-30'), untested: true }), ]; /** diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 54184f62cb..21bf71ad81 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -19,7 +19,7 @@ "directory": "packages/@jsii/dotnet-runtime-test" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index 9f4ddca442..d7f31f86e3 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -25,7 +25,7 @@ "directory": "packages/@jsii/dotnet-runtime" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/java-runtime-test/package.json b/packages/@jsii/java-runtime-test/package.json index b848243a00..41d975352e 100644 --- a/packages/@jsii/java-runtime-test/package.json +++ b/packages/@jsii/java-runtime-test/package.json @@ -18,7 +18,7 @@ "directory": "packages/@jsii/java-runtime-test" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/java-runtime-test/pom.xml.t.js b/packages/@jsii/java-runtime-test/pom.xml.t.js index d661dbde3e..3c0b00bd49 100644 --- a/packages/@jsii/java-runtime-test/pom.xml.t.js +++ b/packages/@jsii/java-runtime-test/pom.xml.t.js @@ -54,7 +54,7 @@ process.stdout.write(` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 @@ -64,7 +64,7 @@ process.stdout.write(` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.0.0 enforce-maven @@ -85,7 +85,7 @@ process.stdout.write(` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.16.0 false @@ -94,7 +94,7 @@ process.stdout.write(` org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.1.2 diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index a0fbd0b12b..a5702985f8 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -19,7 +19,7 @@ "directory": "packages/@jsii/java-runtime" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/java-runtime/pom.xml.t.js b/packages/@jsii/java-runtime/pom.xml.t.js index 2489f00498..763c547f51 100644 --- a/packages/@jsii/java-runtime/pom.xml.t.js +++ b/packages/@jsii/java-runtime/pom.xml.t.js @@ -141,7 +141,7 @@ process.stdout.write(` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 @@ -151,7 +151,7 @@ process.stdout.write(` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -165,7 +165,7 @@ process.stdout.write(` org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.5.0 attach-javadocs @@ -182,18 +182,18 @@ process.stdout.write(` maven-surefire-plugin - 3.0.0-M5 + 3.1.2 maven-failsafe-plugin - 3.0.0-M5 + 3.1.2 org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -214,7 +214,7 @@ process.stdout.write(` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.16.0 false diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 4b6ca9ce13..8cec5a1a23 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -17,7 +17,7 @@ "directory": "packages/@jsii/kernel" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index 5d67ab608a..7f45c08864 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -18,7 +18,7 @@ "directory": "packages/@jsii/python-runtime" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "index.js", "scripts": { diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index e6b19e2464..b740b97366 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -17,7 +17,7 @@ "directory": "packages/@jsii/runtime" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index e0f88355cf..b98d254eca 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -17,7 +17,7 @@ "directory": "packages/@jsii/spec" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 185e187c3b..6ce4907c30 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -19,7 +19,7 @@ "directory": "packages/@scope/jsii-calc-base-of-base" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "build/lib/index.js", "types": "build/lib/index.d.ts", diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 7849d46e45..c8a3d636cc 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -19,7 +19,7 @@ "directory": "packages/@scope/jsii-calc-base" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index d3bc5c4f32..35a94c2cac 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -21,7 +21,7 @@ "directory": "packages/@scope/jsii-calc-lib" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "build/index.js", "types": "build/index.d.ts", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index a1a8d8f370..e2ca0f202d 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -17,7 +17,7 @@ "directory": "packages/codemaker" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index c89e77a126..2cd8dca302 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -28,7 +28,7 @@ "test" ], "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 62546c39d6..56ad7d202d 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -17,7 +17,7 @@ "directory": "packages/jsii-diff" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "bin": { diff --git a/packages/jsii-pacmak/bin/jsii-pacmak.ts b/packages/jsii-pacmak/bin/jsii-pacmak.ts index f433867c9e..1a900d5443 100644 --- a/packages/jsii-pacmak/bin/jsii-pacmak.ts +++ b/packages/jsii-pacmak/bin/jsii-pacmak.ts @@ -1,5 +1,6 @@ #!/usr/bin/env node import '@jsii/check-node/run'; +import '../lib/suppress-jsii-upgrade-prompts'; import { UnknownSnippetMode } from 'jsii-rosetta'; import * as yargs from 'yargs'; diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts index 67a7ad36dd..034f8d962a 100644 --- a/packages/jsii-pacmak/lib/targets/java.ts +++ b/packages/jsii-pacmak/lib/targets/java.ts @@ -1146,13 +1146,18 @@ class JavaGenerator extends Generator { { groupId: 'org.apache.maven.plugins', artifactId: 'maven-compiler-plugin', - version: '3.8.1', - configuration: { source: '1.8', target: '1.8' }, + version: '3.11.0', + configuration: { + source: '1.8', + target: '1.8', + fork: 'true', + maxmem: '4096m', + }, }, { groupId: 'org.apache.maven.plugins', artifactId: 'maven-jar-plugin', - version: '3.2.0', + version: '3.3.0', configuration: { archive: { index: true, @@ -1166,7 +1171,7 @@ class JavaGenerator extends Generator { { groupId: 'org.apache.maven.plugins', artifactId: 'maven-source-plugin', - version: '3.2.1', + version: '3.3.0', executions: { execution: { id: 'attach-sources', @@ -1177,7 +1182,7 @@ class JavaGenerator extends Generator { { groupId: 'org.apache.maven.plugins', artifactId: 'maven-javadoc-plugin', - version: '3.2.0', + version: '3.5.0', executions: { execution: { id: 'attach-javadocs', @@ -1206,7 +1211,7 @@ class JavaGenerator extends Generator { { groupId: 'org.apache.maven.plugins', artifactId: 'maven-enforcer-plugin', - version: '3.0.0-M3', + version: '3.3.0', executions: { execution: { id: 'enforce-maven', @@ -1222,7 +1227,7 @@ class JavaGenerator extends Generator { { groupId: 'org.codehaus.mojo', artifactId: 'versions-maven-plugin', - version: '2.8.1', + version: '2.16.0', configuration: { generateBackupPoms: false, }, diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 395298d8c6..f2c6e12029 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -17,7 +17,7 @@ "directory": "packages/jsii-pacmak" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap index bdb47bb3f8..aa10fa299c 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap @@ -617,16 +617,18 @@ exports[`diamond-struct-parameter.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -640,7 +642,7 @@ exports[`diamond-struct-parameter.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -653,7 +655,7 @@ exports[`diamond-struct-parameter.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -677,7 +679,7 @@ exports[`diamond-struct-parameter.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -697,7 +699,7 @@ exports[`diamond-struct-parameter.ts: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -2236,16 +2238,18 @@ exports[`nested-types.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -2259,7 +2263,7 @@ exports[`nested-types.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -2272,7 +2276,7 @@ exports[`nested-types.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -2296,7 +2300,7 @@ exports[`nested-types.ts: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -2316,7 +2320,7 @@ exports[`nested-types.ts: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap index e9278f4ddf..2d907b07b4 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap @@ -220,16 +220,18 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -243,7 +245,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -256,7 +258,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -280,7 +282,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -300,7 +302,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -733,16 +735,18 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -756,7 +760,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -769,7 +773,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -793,7 +797,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -813,7 +817,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -1234,16 +1238,18 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -1257,7 +1263,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -1270,7 +1276,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -1294,7 +1300,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -1314,7 +1320,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -1724,16 +1730,18 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -1747,7 +1755,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -1760,7 +1768,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -1784,7 +1792,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -1804,7 +1812,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap index 2d146a2608..87b61f7be7 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap @@ -306,16 +306,18 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -329,7 +331,7 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -342,7 +344,7 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -366,7 +368,7 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -386,7 +388,7 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -1031,16 +1033,18 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -1054,7 +1058,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -1067,7 +1071,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -1091,7 +1095,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -1111,7 +1115,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -1745,16 +1749,18 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -1768,7 +1774,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -1781,7 +1787,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -1805,7 +1811,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -1825,7 +1831,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false @@ -4384,16 +4390,18 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 + true + 4096m org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 true @@ -4407,7 +4415,7 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -4420,7 +4428,7 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -4444,7 +4452,7 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.3.0 enforce-maven @@ -4464,7 +4472,7 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.16.0 false diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index b5c64e2166..12d106283a 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -17,7 +17,7 @@ "directory": "packages/jsii-reflect" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 58f0ccee56..53a269155f 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -53,7 +53,7 @@ "directory": "packages/jsii-rosetta" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "publishConfig": { "tag": "v1" diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 5aeb735948..e282157f82 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -17,7 +17,7 @@ "directory": "packages/jsii" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 7bc37c32df..86029d1bac 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -17,7 +17,7 @@ "directory": "packages/oo-ascii-tree" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/tools/jsii-build-tools/package.json b/tools/jsii-build-tools/package.json index 06234cad8a..663f196842 100644 --- a/tools/jsii-build-tools/package.json +++ b/tools/jsii-build-tools/package.json @@ -18,7 +18,7 @@ "directory": "tools/jsii-build-tools" }, "engines": { - "node": ">= 14.6.0" + "node": ">= 14.17.0" }, "bin": { "diff-test": "bin/diff-test", From 810ba06846bb4e14224a2656e7f3393797f02eef Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Fri, 9 Jun 2023 12:27:40 +0100 Subject: [PATCH 08/12] chore: fix 1.83.0 release notes (#4139) These were generated incorrectly during the release because the previous release PR was accidentally squashed. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- CHANGELOG.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12efdd33f7..26ae5f2333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,20 +4,6 @@ All notable changes to this project will be documented in this file. See [standa ## [1.83.0](https://github.com/aws/jsii/compare/v1.82.0...v1.83.0) (2023-06-07) - -### Features - -* **go:** register exported properties as callbacks ([#4104](https://github.com/aws/jsii/issues/4104)) ([fa921ec](https://github.com/aws/jsii/commit/fa921ecfb1dab52144e89cbbeeba0b334779cde9)), closes [cdk8s-team/cdk8s#1326](https://github.com/cdk8s-team/cdk8s/issues/1326) -* **superchain:** switch to JDK 20 ([#4082](https://github.com/aws/jsii/issues/4082)) ([f0a1dfc](https://github.com/aws/jsii/commit/f0a1dfce8edb06a1b71758b49886580e6ee271ff)) - - -### Bug Fixes - -* **jsii-pacmak:** disable `doclint` ([#4103](https://github.com/aws/jsii/issues/4103)) ([30afa09](https://github.com/aws/jsii/commit/30afa095e296d71d3700a2a56a36483a92c5457d)) -* **jsii-pacmak:** emit correct `[@return](https://github.com/return)` tag for JavaDocs ([#4095](https://github.com/aws/jsii/issues/4095)) ([fc7ab7c](https://github.com/aws/jsii/commit/fc7ab7c57f4a94949794cc963bbf644ad491d246)) -* **jsii-pacmak:** escape documentation in all positions ([#4096](https://github.com/aws/jsii/issues/4096)) ([6a2248d](https://github.com/aws/jsii/commit/6a2248dde982d2758976cc1b5d4c3e7676b0f204)) -* **pacmak:** _ is not treated as a keyword in Java ([#4094](https://github.com/aws/jsii/issues/4094)) ([eaaf3ee](https://github.com/aws/jsii/commit/eaaf3ee20ad64ba5d5ed4441aa12f27f024e7c85)) - ## [1.82.0](https://github.com/aws/jsii/compare/v1.81.0...v1.82.0) (2023-05-22) From 66939cae904abeae24143c8fe570e7917858fe97 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Tue, 13 Jun 2023 08:04:51 -0400 Subject: [PATCH 09/12] chore: npm-check-updates && yarn upgrade (#4138) Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date. --- package.json | 8 +- packages/@jsii/benchmarks/package.json | 2 +- packages/@jsii/python-runtime/package.json | 2 +- packages/@jsii/runtime/package.json | 4 +- packages/@jsii/spec/package.json | 2 +- .../@jsii/spec/src/assembly-utils.test.ts | 2 +- packages/jsii-pacmak/package.json | 2 +- yarn.lock | 314 +++++++++--------- 8 files changed, 173 insertions(+), 163 deletions(-) diff --git a/package.json b/package.json index ced7acbdf3..81b1cf3061 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ }, "devDependencies": { "@jest/types": "^28.1.3", - "@types/jest": "^29.5.1", + "@types/jest": "^29.5.2", "@types/node": "^14.18.48", - "@typescript-eslint/eslint-plugin": "^5.59.8", - "@typescript-eslint/parser": "^5.59.8", + "@typescript-eslint/eslint-plugin": "^5.59.9", + "@typescript-eslint/parser": "^5.59.9", "all-contributors-cli": "^6.26.0", - "eslint": "^8.41.0", + "eslint": "^8.42.0", "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", diff --git a/packages/@jsii/benchmarks/package.json b/packages/@jsii/benchmarks/package.json index 110e981b0e..22f5a65b70 100644 --- a/packages/@jsii/benchmarks/package.json +++ b/packages/@jsii/benchmarks/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@types/glob": "^8.1.0", - "glob": "^10.2.6" + "glob": "^10.2.7" }, "scripts": { "build": "yarn --silent tsc --build && npm run lint", diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index 7f45c08864..657e44dfa4 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -42,6 +42,6 @@ "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", "jsii-pacmak": "^0.0.0", - "pyright": "^1.1.311" + "pyright": "^1.1.313" } } diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index b740b97366..20a7d43d74 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -44,7 +44,7 @@ "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", "source-map-loader": "^4.0.1", - "webpack": "^5.84.1", - "webpack-cli": "^5.1.1" + "webpack": "^5.86.0", + "webpack-cli": "^5.1.4" } } diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index b98d254eca..768d7fcc30 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -36,6 +36,6 @@ "devDependencies": { "fs-extra": "^10.1.0", "jsii-build-tools": "^0.0.0", - "typescript-json-schema": "^0.56.0" + "typescript-json-schema": "^0.57.0" } } diff --git a/packages/@jsii/spec/src/assembly-utils.test.ts b/packages/@jsii/spec/src/assembly-utils.test.ts index 023461b276..340ea10993 100644 --- a/packages/@jsii/spec/src/assembly-utils.test.ts +++ b/packages/@jsii/spec/src/assembly-utils.test.ts @@ -129,7 +129,7 @@ describe(loadAssemblyFromPath, () => { }); expect(() => loadAssemblyFromPath(tmpdir)).toThrowError( - /Error: Invalid assembly redirect:\n \* redirect\/compression must be equal to one of the allowed values/m, + /Error: Invalid assembly redirect:\n \* redirect\/compression must be equal to constant/m, ); }); diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index f2c6e12029..e654e7d1b2 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -65,7 +65,7 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", - "pyright": "^1.1.311" + "pyright": "^1.1.313" }, "keywords": [ "jsii", diff --git a/yarn.lock b/yarn.lock index 208f2ccc96..04f7893599 100644 --- a/yarn.lock +++ b/yarn.lock @@ -350,10 +350,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.41.0": - version "8.41.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3" - integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA== +"@eslint/js@8.42.0": + version "8.42.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6" + integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw== "@fixtures/jsii-calc-bundled@file:packages/@fixtures/jsii-calc-bundled": version "0.19.0" @@ -363,10 +363,10 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.11.10": + version "0.11.10" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2" + integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" @@ -763,7 +763,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/source-map@^0.3.2": +"@jridgewell/source-map@^0.3.3": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda" integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg== @@ -1052,10 +1052,10 @@ semver "^7.3.5" which "^2.0.2" -"@npmcli/git@^4.0.0": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.0.4.tgz#cdf74f21b1d440c0756fb28159d935129d9daa33" - integrity sha512-5yZghx+u5M47LghaybLCkdSyFzV/w4OuH12d96HO389Ik9CDsLaDZJVynSGGVJOLn6gy/k7Dz5XYcplM3uxXRg== +"@npmcli/git@^4.0.0", "@npmcli/git@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.1.0.tgz#ab0ad3fd82bc4d8c1351b6c62f0fa56e8fe6afa6" + integrity sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ== dependencies: "@npmcli/promise-spawn" "^6.0.0" lru-cache "^7.4.4" @@ -1158,14 +1158,16 @@ json-parse-even-better-errors "^2.3.1" "@npmcli/package-json@^3.0.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-3.1.0.tgz#d9eb34083be4275520f3844d17fc74926d47cae1" - integrity sha512-qNPy6Yf9ruFST99xcrl5EWAvrb7qFrwgVbwdzcTJlIgxbArKOq5e/bgZ6rTL1X9hDgAdPbvL8RWx/OTLSB0ToA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-3.1.1.tgz#5628332aac90fa1b4d6f98e03988c5958b35e0c5" + integrity sha512-+UW0UWOYFKCkvszLoTwrYGrjNrT8tI5Ckeb/h+Z1y1fsNJEctl7HmerA5j2FgmoqFaLI2gsA1X9KgMFqx/bRmA== dependencies: + "@npmcli/git" "^4.1.0" glob "^10.2.2" json-parse-even-better-errors "^3.0.0" normalize-package-data "^5.0.0" npm-normalize-package-bin "^3.0.1" + proc-log "^3.0.0" "@npmcli/promise-spawn@^3.0.0": version "3.0.0" @@ -1308,11 +1310,9 @@ "@octokit/types" "^6.0.3" "@octokit/auth-token@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.3.tgz#ce7e48a3166731f26068d7a7a7996b5da58cbe0c" - integrity sha512-/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA== - dependencies: - "@octokit/types" "^9.0.0" + version "3.0.4" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db" + integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ== "@octokit/core@^3.5.1": version "3.6.0" @@ -1544,6 +1544,15 @@ resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4" integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ== +"@sigstore/tuf@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.0.tgz#13b69323e7bf8de458cd6c952c57acd1169772a5" + integrity sha512-bLzi9GeZgMCvjJeLUIfs8LJYCxrPRA8IXQkzUtaFKKVPTz0mucRyqFcV2U20yg9K+kYAD0YSitzGfRZCFLjdHQ== + dependencies: + "@sigstore/protobuf-specs" "^0.1.0" + make-fetch-happen "^11.0.1" + tuf-js "^1.1.3" + "@sinclair/typebox@^0.24.1": version "0.24.51" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" @@ -1647,9 +1656,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.0.tgz#4709d34d3eba3e1dad1950d40e80c6b5e0b81fc9" - integrity sha512-TBOjqAGf0hmaqRwpii5LLkJLg7c6OMm4nHLmpsUxwk9bBHtoTC6dAHdVWdGv4TBxj2CZOZY8Xfq8WmfoVi7n4Q== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf" + integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg== dependencies: "@babel/types" "^7.20.7" @@ -1743,10 +1752,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^29.5.1": - version "29.5.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.1.tgz#83c818aa9a87da27d6da85d3378e5a34d2f31a47" - integrity sha512-tEuVcHrpaixS36w7hpsfLBLpjtMRJUE09/MHXn923LOVojDwyC14cWcfc0rDs0VEfUyYmt/+iX1kxxp+gZMcaQ== +"@types/jest@^29.5.2": + version "29.5.2" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b" + integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -1814,9 +1823,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.1.5": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" - integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== + version "2.7.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" + integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== "@types/semver@^7.3.12", "@types/semver@^7.5.0": version "7.5.0" @@ -1892,15 +1901,15 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz#1e7a3e5318ece22251dfbc5c9c6feeb4793cc509" - integrity sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ== +"@typescript-eslint/eslint-plugin@^5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz#2604cfaf2b306e120044f901e20c8ed926debf15" + integrity sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.59.8" - "@typescript-eslint/type-utils" "5.59.8" - "@typescript-eslint/utils" "5.59.8" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/type-utils" "5.59.9" + "@typescript-eslint/utils" "5.59.9" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -1908,72 +1917,72 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.8.tgz#60cbb00671d86cf746044ab797900b1448188567" - integrity sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw== +"@typescript-eslint/parser@^5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.9.tgz#a85c47ccdd7e285697463da15200f9a8561dd5fa" + integrity sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ== dependencies: - "@typescript-eslint/scope-manager" "5.59.8" - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/typescript-estree" "5.59.8" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.9" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz#ff4ad4fec6433647b817c4a7d4b4165d18ea2fa8" - integrity sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig== +"@typescript-eslint/scope-manager@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz#eadce1f2733389cdb58c49770192c0f95470d2f4" + integrity sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ== dependencies: - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/visitor-keys" "5.59.8" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/visitor-keys" "5.59.9" -"@typescript-eslint/type-utils@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz#aa6c029a9d7706d26bbd25eb4666398781df6ea2" - integrity sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA== +"@typescript-eslint/type-utils@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz#53bfaae2e901e6ac637ab0536d1754dfef4dafc2" + integrity sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q== dependencies: - "@typescript-eslint/typescript-estree" "5.59.8" - "@typescript-eslint/utils" "5.59.8" + "@typescript-eslint/typescript-estree" "5.59.9" + "@typescript-eslint/utils" "5.59.9" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.8.tgz#212e54414733618f5d0fd50b2da2717f630aebf8" - integrity sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w== +"@typescript-eslint/types@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.9.tgz#3b4e7ae63718ce1b966e0ae620adc4099a6dcc52" + integrity sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw== -"@typescript-eslint/typescript-estree@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz#801a7b1766481629481b3b0878148bd7a1f345d7" - integrity sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg== +"@typescript-eslint/typescript-estree@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz#6bfea844e468427b5e72034d33c9fffc9557392b" + integrity sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA== dependencies: - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/visitor-keys" "5.59.8" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/visitor-keys" "5.59.9" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.8.tgz#34d129f35a2134c67fdaf024941e8f96050dca2b" - integrity sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg== +"@typescript-eslint/utils@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.9.tgz#adee890107b5ffe02cd46fdaa6c2125fb3c6c7c4" + integrity sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.59.8" - "@typescript-eslint/types" "5.59.8" - "@typescript-eslint/typescript-estree" "5.59.8" + "@typescript-eslint/scope-manager" "5.59.9" + "@typescript-eslint/types" "5.59.9" + "@typescript-eslint/typescript-estree" "5.59.9" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.59.8": - version "5.59.8" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz#aa6a7ef862add919401470c09e1609392ef3cc40" - integrity sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ== +"@typescript-eslint/visitor-keys@5.59.9": + version "5.59.9" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz#9f86ef8e95aca30fb5a705bb7430f95fc58b146d" + integrity sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q== dependencies: - "@typescript-eslint/types" "5.59.8" + "@typescript-eslint/types" "5.59.9" eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": @@ -2097,20 +2106,20 @@ "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.0.tgz#b59b33377b1b896a9a7357cfc643b39c1524b1e6" - integrity sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" - integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.4.tgz#3982ee6f8b42845437fc4d391e93ac5d9da52f0f" - integrity sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xmldom/xmldom@^0.8.8": version "0.8.8" @@ -2133,9 +2142,9 @@ integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== "@yarnpkg/parsers@^3.0.0-rc.18": - version "3.0.0-rc.44" - resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.44.tgz#43bf7943c039681da8f343cc6d73c2ab3184978b" - integrity sha512-UVAt9Icc8zfGXioeYJ8XMoSTxOYVmlal2TRNxy9Uh91taS72kQFalK7LpIslcvEBKy4XtarmfIwcFIU3ZY64lw== + version "3.0.0-rc.45" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.45.tgz#fcc7d0ab7828afdb20d1e13160b1d117c07536f4" + integrity sha512-Aj0aHBV/crFQTpKQvL6k1xNiOhnlfVLu06LunelQAvl1MTeWrSi8LD9UJJDCFJiG4kx8NysUE6Tx0KZyPQUzIw== dependencies: js-yaml "^3.10.0" tslib "^2.4.0" @@ -2192,7 +2201,7 @@ acorn-walk@^8.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -2767,9 +2776,9 @@ camelcase@^6.2.0, camelcase@^6.3.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001489: - version "1.0.30001492" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001492.tgz#4a06861788a52b4c81fd3344573b68cc87fe062b" - integrity sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw== + version "1.0.30001495" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001495.tgz#64a0ccef1911a9dcff647115b4430f8eff1ef2d9" + integrity sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg== case@^1.6.3: version "1.6.3" @@ -3561,9 +3570,9 @@ ejs@^3.1.7: jake "^10.8.5" electron-to-chromium@^1.4.411: - version "1.4.414" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.414.tgz#f9eedb6fb01b50439d8228d8ee3a6fa5e0108437" - integrity sha512-RRuCvP6ekngVh2SAJaOKT/hxqc9JAsK+Pe0hP5tGQIfonU2Zy9gMGdJ+mBdyl/vNucMG6gkXYtuM4H/1giws5w== + version "1.4.425" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.425.tgz#399df13091b836d28283a545c25c8e4d9da86da8" + integrity sha512-wv1NufHxu11zfDbY4fglYQApMswleE9FL/DSeyOyauVXDZ+Kco96JK/tPfBUaDqfRarYp2WH2hJ/5UnVywp9Jg== emittery@^0.10.2: version "0.10.2" @@ -3813,16 +3822,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@^8.41.0: - version "8.41.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c" - integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q== +eslint@^8.42.0: + version "8.42.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291" + integrity sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.4.0" "@eslint/eslintrc" "^2.0.3" - "@eslint/js" "8.41.0" - "@humanwhocodes/config-array" "^0.11.8" + "@eslint/js" "8.42.0" + "@humanwhocodes/config-array" "^0.11.10" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -4432,10 +4441,10 @@ glob@7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2, glob@^10.2.6: - version "10.2.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.2.6.tgz#1e27edbb3bbac055cb97113e27a066c100a4e5e1" - integrity sha512-U/rnDpXJGF414QQQZv5uVsabTVxMSwzS5CH0p3DRCIV6ownl4f7PzGnkGmvlum2wB+9RlJWJZ6ACU1INnBqiPA== +glob@^10.2.2, glob@^10.2.7: + version "10.2.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.2.7.tgz#9dd2828cd5bc7bd861e7738d91e7113dda41d7d8" + integrity sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA== dependencies: foreground-child "^3.1.0" jackspeak "^2.0.3" @@ -6383,9 +6392,9 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== lru-cache@^9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.1.tgz#c58a93de58630b688de39ad04ef02ef26f1902f1" - integrity sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A== + version "9.1.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835" + integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ== make-dir@3.1.0, make-dir@^3.0.0: version "3.1.0" @@ -7571,7 +7580,7 @@ parse-url@^8.1.0: dependencies: parse-path "^7.0.0" -path-equal@^1.1.2: +path-equal@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/path-equal/-/path-equal-1.2.5.tgz#9fcbdd5e5daee448e96f43f3bac06c666b5e982a" integrity sha512-i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g== @@ -7809,10 +7818,10 @@ pure-rand@^6.0.0: resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306" integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ== -pyright@^1.1.311: - version "1.1.311" - resolved "https://registry.yarnpkg.com/pyright/-/pyright-1.1.311.tgz#eaa515a4b9c887a5a53d07a756f0f0c528f1f25f" - integrity sha512-/BBt70SxXyTTfDFT4KOWSanPpytOq3qV0+qZtuxw02X0sZwvO+MpJ4mpK372isoUvr2nWqLe6gfbyqGj4wyRWw== +pyright@^1.1.313: + version "1.1.313" + resolved "https://registry.yarnpkg.com/pyright/-/pyright-1.1.313.tgz#703f54e5afc30e3a72e410209b18332fb9d3b4fa" + integrity sha512-oQfcr3CpR27gkULXhQbNFOyQ6NuRG6pmSiBqPX6DzYkfrBJG47VEnYU9wGvzoHaZirSt2DnLwzTjqsdiQNgWbA== q@^1.5.1: version "1.5.1" @@ -7898,9 +7907,9 @@ read-package-json@^5.0.0, read-package-json@^5.0.2: npm-normalize-package-bin "^2.0.0" read-package-json@^6.0.0: - version "6.0.3" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.3.tgz#726116b75e00eac2075240995f05681af4ca7122" - integrity sha512-4QbpReW4kxFgeBQ0vPAqh2y8sXEB3D4t3jsXbJKIhBiF80KT6XRo45reqwtftju5J6ru1ax06A2Gb/wM1qCOEQ== + version "6.0.4" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.4.tgz#90318824ec456c287437ea79595f4c2854708836" + integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw== dependencies: glob "^10.2.2" json-parse-even-better-errors "^3.0.0" @@ -8187,9 +8196,9 @@ safe-stable-stringify@^2.2.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== schema-utils@^3.1.1, schema-utils@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99" - integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.2.0.tgz#7dff4881064a4f22c09f0c6a1457feb820fd0636" + integrity sha512-0zTyLGyDJYd/MBxG1AhJkKa6fpEBds4OQO2ut0w7OYG+ZGhGea09lijvzsqegYSik88zc7cUtIlnnO+/BvD6gQ== dependencies: "@types/json-schema" "^7.0.8" ajv "^6.12.5" @@ -8292,11 +8301,12 @@ signal-exit@^4.0.1: integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q== sigstore@^1.0.0, sigstore@^1.3.0, sigstore@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.5.2.tgz#8d4c2a549341211cb08c687999843edc48c1a94c" - integrity sha512-X95v6xAAooVpn7PaB94TDmFeSO5SBfCtB1R23fvzr36WTfjtkiiyOeei979nbTjc8nzh6FSLeltQZuODsm1EjQ== + version "1.6.0" + resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.6.0.tgz#887a4007c6ee83f3ef3fd844be1a0840e849c301" + integrity sha512-QODKff/qW/TXOZI6V/Clqu74xnInAS6it05mufj4/fSewexLtfEntgLZZcBtUK44CDQyUE5TUXYy1ARYzlfG9g== dependencies: "@sigstore/protobuf-specs" "^0.1.0" + "@sigstore/tuf" "^1.0.0" make-fetch-happen "^11.0.1" tuf-js "^1.1.3" @@ -8760,12 +8770,12 @@ terser-webpack-plugin@^5.3.7: terser "^5.16.8" terser@^5.16.8: - version "5.17.6" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.6.tgz#d810e75e1bb3350c799cd90ebefe19c9412c12de" - integrity sha512-V8QHcs8YuyLkLHsJO5ucyff1ykrLVsR4dNnS//L5Y3NiSXpbK1J+WMVUs67eI0KTxs9JtHhgEQpXQVHlHI92DQ== + version "5.17.7" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.7.tgz#2a8b134826fe179b711969fd9d9a0c2479b2a8c3" + integrity sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ== dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" commander "^2.20.0" source-map-support "~0.5.20" @@ -8913,9 +8923,9 @@ tslib@^1.8.1, tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.5.0: - version "2.5.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.2.tgz#1b6f07185c881557b0ffa84b111a0106989e8338" - integrity sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA== + version "2.5.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" + integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== tsutils@^3.21.0: version "3.21.0" @@ -8994,15 +9004,15 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript-json-schema@^0.56.0: - version "0.56.0" - resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.56.0.tgz#de3fe196633197aa66b10191e78f51d5f6b45847" - integrity sha512-k/aSEqx89YR2z/f2y3VwoOGzlKTWern0EIey2qqEpMRP7HL4CI8udPElzJs4eFVkPowCLJ1yVBSzuIWIUF+mMA== +typescript-json-schema@^0.57.0: + version "0.57.0" + resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.57.0.tgz#e87e16355ecf942762a7cea224e4f5bf6f65d1c9" + integrity sha512-xirQK0s95K3OL7Knve0OOxQHErByCxUsgXr5oCHa9J0jWgiA+9/tidHWPu1UMjRv7MoX5ViP6QmOrWCi+dvRew== dependencies: "@types/json-schema" "^7.0.9" "@types/node" "^16.9.2" glob "^7.1.7" - path-equal "^1.1.2" + path-equal "^1.2.5" safe-stable-stringify "^2.2.0" ts-node "^10.9.1" typescript "~4.9.5" @@ -9215,15 +9225,15 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webpack-cli@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.1.tgz#c211ac6d911e77c512978f7132f0d735d4a97ace" - integrity sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw== +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.1.0" - "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.4" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" commander "^10.0.1" cross-spawn "^7.0.3" @@ -9247,10 +9257,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.84.1: - version "5.84.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.84.1.tgz#d4493acdeca46b26ffc99d86d784cabfeb925a15" - integrity sha512-ZP4qaZ7vVn/K8WN/p990SGATmrL1qg4heP/MrVneczYtpDGJWlrgZv55vxaV2ul885Kz+25MP2kSXkPe3LZfmg== +webpack@^5.86.0: + version "5.86.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.86.0.tgz#b0eb81794b62aee0b7e7eb8c5073495217d9fc6d" + integrity sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" From 38d327c7f47b3af360c2829bae8b785c9be055b5 Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Tue, 13 Jun 2023 16:16:56 +0200 Subject: [PATCH 10/12] feat(jsii): allow specifying a deprecation message regardless of stability (#4145) Previously, `jsii` required the package's stability to be `deprecated` if there cas a `deprecated` message configured. This is however problematic when a `stable` package reaches End-of-Support and the maintainer wants to signal this in npmjs.com. Instead of failing, only log a warning to possibly raise awareness on an unintended configuration. Additionally - emit the `Development Status :: 7 - Inactive` trove classifier on packages with a `deprecated` message, even if their stability is not `deprecated`. --- packages/jsii-pacmak/lib/targets/python.ts | 9 ++++++++- packages/jsii/lib/project-info.ts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts index e5915a99a1..f06fd7a458 100644 --- a/packages/jsii-pacmak/lib/targets/python.ts +++ b/packages/jsii-pacmak/lib/targets/python.ts @@ -2125,7 +2125,14 @@ class Package { scripts, }; - switch (this.metadata.docs?.stability) { + // Packages w/ a deprecated message may have a non-deprecated stability (e.g: when EoL happens + // for a stable package). We pretend it's deprecated for the purpose of trove classifiers when + // this happens. + switch ( + this.metadata.docs?.deprecated + ? spec.Stability.Deprecated + : this.metadata.docs?.stability + ) { case spec.Stability.Experimental: setupKwargs.classifiers.push('Development Status :: 4 - Beta'); break; diff --git a/packages/jsii/lib/project-info.ts b/packages/jsii/lib/project-info.ts index 2de0ae3f13..ce69463553 100644 --- a/packages/jsii/lib/project-info.ts +++ b/packages/jsii/lib/project-info.ts @@ -484,7 +484,7 @@ function _validateStability( if (!stability && deprecated) { stability = spec.Stability.Deprecated; } else if (deprecated && stability !== spec.Stability.Deprecated) { - throw new Error( + console.warn( `Package is deprecated (${deprecated}), but it's stability is ${stability} and not ${spec.Stability.Deprecated}`, ); } From d047c6f498000f0b433bf8b83ec3cc51f440f3b3 Mon Sep 17 00:00:00 2001 From: AWS CDK Team Date: Tue, 13 Jun 2023 15:38:18 +0000 Subject: [PATCH 11/12] chore(release): 1.84.0 --- CHANGELOG.md | 7 +++++++ lerna.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ae5f2333..1d5cf2ac51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.84.0](https://github.com/aws/jsii/compare/v1.83.0...v1.84.0) (2023-06-13) + + +### Features + +* **jsii:** allow specifying a deprecation message regardless of stability ([#4145](https://github.com/aws/jsii/issues/4145)) ([38d327c](https://github.com/aws/jsii/commit/38d327c7f47b3af360c2829bae8b785c9be055b5)) + ## [1.83.0](https://github.com/aws/jsii/compare/v1.82.0...v1.83.0) (2023-06-07) ## [1.82.0](https://github.com/aws/jsii/compare/v1.81.0...v1.82.0) (2023-05-22) diff --git a/lerna.json b/lerna.json index 7a84df8c89..b3a7ac1f71 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "1.83.0" + "version": "1.84.0" } From fb3dae7e84996f3b2d02b4c3a8dd04ca58695ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=A7=91=F0=9F=8F=BB=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier?= Date: Tue, 13 Jun 2023 18:00:50 +0200 Subject: [PATCH 12/12] chore(superchain): upgrade Maven to 3.9.2 (3.9.1 no longer exists) --- superchain/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superchain/Dockerfile b/superchain/Dockerfile index 233cff5c01..5ce65eec03 100644 --- a/superchain/Dockerfile +++ b/superchain/Dockerfile @@ -39,7 +39,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sou SHELL ["/bin/zsh", "-c"] # Prepare maven binary distribution -ARG M2_VERSION="3.9.1" +ARG M2_VERSION="3.9.2" ENV M2_DISTRO="https://www.apache.org/dist/maven/maven-3" RUN set -eo pipefail \ && curl -fSsL "${M2_DISTRO}/${M2_VERSION}/binaries/apache-maven-${M2_VERSION}-bin.tar.gz" \