Merge branch 'v1.0.6' into v1.0.6_optimize_restarts

Signed-off-by: Ratnakar <[email protected]>

.github/workflows/release.yaml

@@ -39,6 +39,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: setup
+        run: |
+          scripts/install-tools.sh
+          make setup
+
       - name: Login to the GitHub Container Registry
         uses: docker/login-action@v2
         with:

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/go-test/deep v1.0.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/hyperledger/fabric v1.4.12
-	github.com/hyperledger/fabric-ca v1.5.5
+	github.com/hyperledger/fabric-ca v1.5.6
 	github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c
 	github.com/imdario/mergo v0.3.12
 	github.com/lib/pq v1.8.0
@@ -48,6 +48,7 @@ require (
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/Shopify/sarama v1.30.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
@@ -108,8 +109,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.10.0 // indirect
-	github.com/prometheus/procfs v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
@@ -123,7 +124,7 @@ require (
 	github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.9.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
@@ -150,9 +151,9 @@ require (
 )
 
 replace (
-	github.com/go-kit/kit => github.com/go-kit/kit v0.8.0 // Needed for fabric-ca
-	github.com/gorilla/handlers => github.com/gorilla/handlers v1.4.0 // Needed for fabric-ca
-	github.com/gorilla/mux => github.com/gorilla/mux v1.7.3 // Needed for fabric-ca
+	github.com/go-kit/kit => github.com/go-kit/kit v0.9.0 // Needed for fabric-ca
+	github.com/gorilla/handlers => github.com/gorilla/handlers v1.5.1 // Needed for fabric-ca
+	github.com/gorilla/mux => github.com/gorilla/mux v1.8.0 // Needed for fabric-ca
 	github.com/hyperledger/fabric => github.com/hyperledger/fabric v0.0.0-20191027202024-115c7a2205a6
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.0 // Needed for fabric-ca
+	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.1 // Needed for fabric-ca
 )