Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: version updates, including breaking changes in jsii #22382

Merged
merged 10 commits into from
Oct 6, 2022

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Oct 6, 2022

This is a re-roll of #22269 but in a PR and branch that the GitHub Action will not continuously overwrite so I can fix the branch over a long period.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@gitpod-io
Copy link

gitpod-io bot commented Oct 6, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team October 6, 2022 08:55
@github-actions github-actions bot added the p2 label Oct 6, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Oct 6, 2022
@rix0rrr rix0rrr changed the title Huijbers/version update fixes chore: version updates, including breaking changes in jsii Oct 6, 2022
@rix0rrr rix0rrr self-assigned this Oct 6, 2022
Copy link
Contributor

@Naumel Naumel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

@Naumel
Copy link
Contributor

Naumel commented Oct 6, 2022

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Oct 6, 2022

update

✅ Branch has been successfully updated

@mergify
Copy link
Contributor

mergify bot commented Oct 6, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: ba44de2
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Oct 6, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit f169d7f into main Oct 6, 2022
@mergify mergify bot deleted the huijbers/version-update-fixes branch October 6, 2022 11:01
@comcalvi
Copy link
Contributor

@Mergifyio backport v1-main

@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2022

backport v1-main

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Oct 11, 2022
This is a re-roll of #22269 but in a PR and branch that the GitHub Action will not continuously overwrite so I can fix the branch over a long period.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

(cherry picked from commit f169d7f)

# Conflicts:
#	package.json
#	packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
#	packages/@aws-cdk/aws-ec2/lib/vpc.ts
#	packages/@aws-cdk/aws-ec2/test/vpc.test.ts
#	packages/@aws-cdk/aws-eks/package.json
#	packages/@aws-cdk/cloudformation-diff/package.json
#	packages/@aws-cdk/core/package.json
#	packages/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts
#	packages/@aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource-vpc.ts
#	packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
#	packages/@aws-cdk/integ-runner/package.json
#	packages/@aws-cdk/integ-tests/package.json
#	packages/@monocdk-experiment/assert/package.json
#	packages/@monocdk-experiment/rewrite-imports/package.json
#	packages/aws-cdk-lib/package.json
#	packages/aws-cdk-migration/package.json
#	packages/aws-cdk/THIRD_PARTY_LICENSES
#	packages/aws-cdk/package.json
#	packages/awslint/package.json
#	packages/cdk-assets/package.json
#	packages/cdk-cli-wrapper/package.json
#	packages/cdk-dasm/package.json
#	packages/monocdk/package.json
#	tools/@aws-cdk/cdk-build-tools/package.json
#	tools/@aws-cdk/cfn2ts/package.json
#	tools/@aws-cdk/eslint-plugin/package.json
#	tools/@aws-cdk/node-bundle/package.json
#	tools/@aws-cdk/prlint/package.json
#	tools/@aws-cdk/yarn-cling/package.json
#	yarn.lock
mergify bot added a commit that referenced this pull request Oct 12, 2022
…22382) (#22464)

This is an automatic backport of pull request #22382 done by [Mergify](https://mergify.com).
Cherry-pick of f169d7f has failed:
```
On branch mergify/bp/v1-main/pr-22382
Your branch is up to date with 'origin/v1-main'.

You are currently cherry-picking commit f169d7f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json
	modified:   packages/@aws-cdk/aws-cloudformation/package.json
	modified:   packages/@aws-cdk/aws-dynamodb/package.json
	modified:   packages/@aws-cdk/aws-ec2/package.json
	modified:   packages/@aws-cdk/aws-ec2/test/vpn.test.ts
	modified:   packages/@aws-cdk/aws-iam/package.json
	modified:   packages/@aws-cdk/aws-lambda-nodejs/package.json
	modified:   packages/@aws-cdk/aws-lambda/package.json
	modified:   packages/@aws-cdk/aws-logs/package.json
	modified:   packages/@aws-cdk/aws-route53/package.json
	modified:   packages/@aws-cdk/aws-s3/package.json
	modified:   packages/@aws-cdk/aws-ses/package.json
	modified:   packages/@aws-cdk/custom-resources/package.json
	modified:   tools/@aws-cdk/cdk-build-tools/lib/deprecated-symbols.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   package.json
	both modified:   packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
	both modified:   packages/@aws-cdk/aws-ec2/lib/vpc.ts
	both modified:   packages/@aws-cdk/aws-ec2/test/vpc.test.ts
	both modified:   packages/@aws-cdk/aws-eks/package.json
	both modified:   packages/@aws-cdk/cloudformation-diff/package.json
	both modified:   packages/@aws-cdk/core/package.json
	both modified:   packages/@aws-cdk/custom-resources/test/aws-custom-resource/aws-custom-resource.test.ts
	deleted by us:   packages/@aws-cdk/custom-resources/test/aws-custom-resource/integ.aws-custom-resource-vpc.ts
	both modified:   packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
	both modified:   packages/@aws-cdk/integ-runner/package.json
	both modified:   packages/@aws-cdk/integ-tests/package.json
	both modified:   packages/@monocdk-experiment/assert/package.json
	both modified:   packages/@monocdk-experiment/rewrite-imports/package.json
	both modified:   packages/aws-cdk-lib/package.json
	both modified:   packages/aws-cdk-migration/package.json
	both modified:   packages/aws-cdk/THIRD_PARTY_LICENSES
	both modified:   packages/aws-cdk/package.json
	both modified:   packages/awslint/package.json
	both modified:   packages/cdk-assets/package.json
	both modified:   packages/cdk-cli-wrapper/package.json
	both modified:   packages/cdk-dasm/package.json
	both modified:   packages/monocdk/package.json
	both modified:   tools/@aws-cdk/cdk-build-tools/package.json
	both modified:   tools/@aws-cdk/cfn2ts/package.json
	both modified:   tools/@aws-cdk/eslint-plugin/package.json
	both modified:   tools/@aws-cdk/node-bundle/package.json
	both modified:   tools/@aws-cdk/prlint/package.json
	both modified:   tools/@aws-cdk/yarn-cling/package.json
	both modified:   yarn.lock

```


To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
@HBobertz HBobertz mentioned this pull request Nov 10, 2022
4 tasks
homakk pushed a commit to homakk/aws-cdk that referenced this pull request Dec 1, 2022
This is a re-roll of aws#22269 but in a PR and branch that the GitHub Action will not continuously overwrite so I can fix the branch over a long period.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS. p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants