Skip to content

Commit fb0b8fb

Browse files
bestbeforetodaybestbeforetoday
committed
Update dependencies to address GO-2024-2687
Signed-off-by: Mark S. Lewis <[email protected]>
1 parent f026b2c commit fb0b8fb

File tree

7 files changed

+26
-30
lines changed

7 files changed

+26
-30
lines changed

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/stretchr/testify v1.9.0
1111
go.uber.org/mock v0.4.0
1212
golang.org/x/crypto v0.21.0
13-
google.golang.org/grpc v1.62.1
13+
google.golang.org/grpc v1.63.0
1414
google.golang.org/protobuf v1.33.0
1515
)
1616

@@ -19,14 +19,13 @@ require (
1919
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
2020
github.com/davecgh/go-spew v1.1.1 // indirect
2121
github.com/gofrs/uuid v4.4.0+incompatible // indirect
22-
github.com/golang/protobuf v1.5.4 // indirect
2322
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
2423
github.com/hashicorp/go-memdb v1.3.4 // indirect
2524
github.com/hashicorp/golang-lru v1.0.2 // indirect
2625
github.com/pmezard/go-difflib v1.0.0 // indirect
27-
golang.org/x/net v0.22.0 // indirect
26+
golang.org/x/net v0.23.0 // indirect
2827
golang.org/x/sys v0.18.0 // indirect
2928
golang.org/x/text v0.14.0 // indirect
30-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
29+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
3130
gopkg.in/yaml.v3 v3.0.1 // indirect
3231
)

‎go.sum‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
1313
github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
1414
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
1515
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
16-
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
17-
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
1816
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1917
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2018
github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -58,16 +56,16 @@ go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
5856
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
5957
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
6058
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
61-
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
62-
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
59+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
60+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
6361
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
6462
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
6563
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
6664
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
67-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 h1:IR+hp6ypxjH24bkMfEJ0yHR21+gwPWdV+/IBrPQyn3k=
68-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
69-
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
70-
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4=
66+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
67+
google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
68+
google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
7169
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
7270
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
7371
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
<dependency>
374374
<groupId>com.puppycrawl.tools</groupId>
375375
<artifactId>checkstyle</artifactId>
376-
<version>10.14.2</version>
376+
<version>10.15.0</version>
377377
</dependency>
378378
</dependencies>
379379
</plugin>
@@ -387,7 +387,7 @@
387387
<plugin>
388388
<groupId>org.owasp</groupId>
389389
<artifactId>dependency-check-maven</artifactId>
390-
<version>9.0.10</version>
390+
<version>9.1.0</version>
391391
<configuration>
392392
<skipProvidedScope>true</skipProvidedScope>
393393
<skipTestScope>true</skipTestScope>

‎node/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
"pkcs11js": "^2.1.0"
4343
},
4444
"devDependencies": {
45-
"@cyclonedx/cyclonedx-npm": "^1.16.1",
46-
"@tsconfig/node18": "^18.2.2",
45+
"@cyclonedx/cyclonedx-npm": "^1.16.2",
46+
"@tsconfig/node18": "^18.2.4",
4747
"@types/google-protobuf": "^3.15.12",
4848
"@types/jest": "^29.5.12",
49-
"@types/node": "^18.19.22",
50-
"@typescript-eslint/eslint-plugin": "~7.3.1",
51-
"@typescript-eslint/parser": "~7.3.1",
49+
"@types/node": "^18.19.29",
50+
"@typescript-eslint/eslint-plugin": "~7.5.0",
51+
"@typescript-eslint/parser": "~7.5.0",
5252
"eslint": "^8.57.0",
5353
"eslint-config-prettier": "^9.1.0",
5454
"eslint-plugin-jest": "^27.9.0",
@@ -58,6 +58,6 @@
5858
"prettier": "^3.2.5",
5959
"ts-jest": "^29.1.2",
6060
"typedoc": "^0.25.11",
61-
"typescript": "~5.4.2"
61+
"typescript": "~5.4.3"
6262
}
6363
}

‎pkg/client/example_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func NewGrpcConnection() (*grpc.ClientConn, error) {
5959
certPool.AddCert(tlsCertificate)
6060
transportCredentials := credentials.NewClientTLSFromCert(certPool, "")
6161

62-
return grpc.Dial("gateway.example.org:1337", grpc.WithTransportCredentials(transportCredentials))
62+
return grpc.NewClient("dns:///gateway.example.org:1337", grpc.WithTransportCredentials(transportCredentials))
6363
}
6464

6565
// NewIdentity creates a client identity for this Gateway connection using an X.509 certificate.

‎scenario/go/scenario_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"fmt"
1515
"os"
1616
"reflect"
17-
"strconv"
1817
"strings"
1918

2019
"github.com/cucumber/godog"
@@ -180,10 +179,10 @@ func connectGateway(peer string) error {
180179
certPool := x509.NewCertPool()
181180
certPool.AddCert(certificate)
182181

183-
url := conn.host + ":" + strconv.FormatUint(uint64(conn.port), 10)
182+
url := fmt.Sprintf("dns:///%s:%d", conn.host, conn.port)
184183

185184
transportCredentials := credentials.NewClientTLSFromCert(certPool, conn.serverNameOverride)
186-
clientConn, err := grpc.Dial(url, grpc.WithTransportCredentials(transportCredentials))
185+
clientConn, err := grpc.NewClient(url, grpc.WithTransportCredentials(transportCredentials))
187186
if err != nil {
188187
return err
189188
}

‎scenario/node/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
"@hyperledger/fabric-protos": "^0.3.0"
2626
},
2727
"devDependencies": {
28-
"@cucumber/cucumber": "^10.3.1",
29-
"@tsconfig/node18": "^18.2.2",
30-
"@types/node": "^18.19.22",
31-
"@typescript-eslint/eslint-plugin": "~7.3.1",
32-
"@typescript-eslint/parser": "~7.3.1",
28+
"@cucumber/cucumber": "^10.3.2",
29+
"@tsconfig/node18": "^18.2.4",
30+
"@types/node": "^18.19.29",
31+
"@typescript-eslint/eslint-plugin": "~7.5.0",
32+
"@typescript-eslint/parser": "~7.5.0",
3333
"cucumber-console-formatter": "^1.0.0",
3434
"eslint": "^8.57.0",
3535
"eslint-config-prettier": "^9.1.0",
3636
"expect": "^29.7.0",
3737
"npm-run-all": "^4.1.5",
3838
"prettier": "^3.2.5",
39-
"typescript": "~5.4.2"
39+
"typescript": "~5.4.3"
4040
}
4141
}

0 commit comments

Comments
 (0)