Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Update dependencies to support Apple silicon (M1 / arm64) (backport #230) - #232

Merged
bestbeforetoday merged 1 commit into
release-2.2from
mergify/bp/release-2.2/pr-230
Sep 21, 2022
Merged

bestbeforetoday merged 1 commit into
release-2.2from
mergify/bp/release-2.2/pr-230

Conversation

@mergify

@mergify mergify Bot commented Sep 21, 2022

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #230 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

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 you can:

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

Finally, you can contact us on https://mergify.com

netty-tcnative-boringssl-static caused linkage errors on M1 Mac when using a native arm64 JVM.

Signed-off-by: Mark S. Lewis <[email protected]>

Signed-off-by: Mark S. Lewis <[email protected]>
(cherry picked from commit 74c3c48)
@bestbeforetoday
bestbeforetoday merged commit d1bbf2f into release-2.2 Sep 21, 2022
@bestbeforetoday
bestbeforetoday deleted the mergify/bp/release-2.2/pr-230 branch September 21, 2022 11:09
marcopaulocova added a commit to VOID-SOFTWARE/fabric-sdk-java that referenced this pull request Oct 4, 2022
* release-2.2-github:
  Release v2.2.17 (hyperledger#235)
  Update dependencies to address CVE-2022-38752 (hyperledger#231) (hyperledger#233)
  Update dependencies to support Apple silicon (M1 / arm64) (hyperledger#232)
  release v2.2.16 (hyperledger#227)
  Fix CVE-2022-25857 (hyperledger#224) (hyperledger#225)
  Release v2.2.15 (hyperledger#220)
  GitHub Actions build (hyperledger#218)
  Update chaincode dependencies to avoid dependabot alerts (hyperledger#217)
  Performance improvement for CryptoPrimitives (hyperledger#214)
  Disabled scehduled security vulnerability scan (hyperledger#213)
  Release v2.2.14 (hyperledger#202)
  Address security vulnerability CVE-2022-25647 (hyperledger#199) (hyperledger#200)

# Conflicts:
#	pom.xml
#	src/main/java/org/hyperledger/fabric/sdk/LifecycleChaincodePackage.java
marcopaulocova added a commit to VOID-SOFTWARE/fabric-sdk-java that referenced this pull request Oct 4, 2022
* release-2.2:
  Release v2.2.17 (hyperledger#235)
  Update dependencies to address CVE-2022-38752 (hyperledger#231) (hyperledger#233)
  Update dependencies to support Apple silicon (M1 / arm64) (hyperledger#232)
  release v2.2.16 (hyperledger#227)
  Fix CVE-2022-25857 (hyperledger#224) (hyperledger#225)
  Release v2.2.15 (hyperledger#220)
  GitHub Actions build (hyperledger#218)
  Update chaincode dependencies to avoid dependabot alerts (hyperledger#217)
  Performance improvement for CryptoPrimitives (hyperledger#214)
  Disabled scehduled security vulnerability scan (hyperledger#213)
  Release v2.2.14 (hyperledger#202)
  Address security vulnerability CVE-2022-25647 (hyperledger#199) (hyperledger#200)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant