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

bump canton + fix bouncycastle #17228

Merged
merged 12 commits into from
Aug 4, 2023
Merged

bump canton + fix bouncycastle #17228

merged 12 commits into from
Aug 4, 2023

Conversation

remyhaemmerle-da
Copy link
Collaborator

@remyhaemmerle-da remyhaemmerle-da commented Aug 3, 2023

Handle breaking change from https://github.com/DACH-NY/canton/pull/14131

@remyhaemmerle-da remyhaemmerle-da marked this pull request as ready for review August 3, 2023 15:37
@remyhaemmerle-da remyhaemmerle-da changed the title bump canton bump canton + fix bouncycastle Aug 4, 2023
@@ -17,6 +17,7 @@ java_binary(
runtime_deps = [
# Do not sort
"//canton:lib",
"@maven//:org_bouncycastle_bcprov_jdk15on",
Copy link
Contributor

Choose a reason for hiding this comment

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

do you need this even though the bcprov jar is in canton/lib ? The risk here is that if we update the version in canton we forget to update it here and get mismatching runtime versions ?

Copy link
Collaborator Author

@remyhaemmerle-da remyhaemmerle-da Aug 4, 2023

Choose a reason for hiding this comment

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

We can try to do something clever in main, for 2.7.x this seems acceptable for me.

@remyhaemmerle-da remyhaemmerle-da requested review from a team as code owners August 4, 2023 09:29
@remyhaemmerle-da remyhaemmerle-da enabled auto-merge (squash) August 4, 2023 12:17
@remyhaemmerle-da remyhaemmerle-da enabled auto-merge (squash) August 4, 2023 12:18
@remyhaemmerle-da remyhaemmerle-da merged commit 4dee553 into release/2.7.x Aug 4, 2023
@remyhaemmerle-da remyhaemmerle-da deleted the remy-2.7.x branch August 4, 2023 12:40
remyhaemmerle-da added a commit that referenced this pull request Aug 4, 2023
* Rename UserError and DevError

* activate DeeplyNestedValueIT (disable in #17228)

---------

Co-authored-by: Remy Haemmerle <Remy.Haemmerle@daml.com>
garyverhaegen-da added a commit that referenced this pull request Aug 5, 2023
remyhaemmerle-da added a commit that referenced this pull request Aug 18, 2023
remyhaemmerle-da added a commit that referenced this pull request Aug 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants