Skip to content

Commit 60f7225

Browse files
mirskifaGitHub Enterprise
authored andcommitted
Merge pull request #403 from mq-cloudpak/amf-consistent-go-version
Ensure consistent use of go 1.18
2 parents 38c55ea + d2f7d37 commit 60f7225

File tree

7 files changed

+23
-31
lines changed

7 files changed

+23
-31
lines changed

go.mod

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
module github.com/ibm-messaging/mq-container
22

3-
go 1.15
3+
go 1.18
44

55
require (
66
github.com/genuinetools/amicontained v0.4.3
77
github.com/ibm-messaging/mq-golang v2.0.0+incompatible
88
github.com/prometheus/client_golang v1.11.1
99
github.com/prometheus/client_model v0.2.0
10-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
1110
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
1211
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
1312
software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001
1413
)
14+
15+
require (
16+
github.com/beorn7/perks v1.0.1 // indirect
17+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
18+
github.com/golang/protobuf v1.4.3 // indirect
19+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
20+
github.com/prometheus/common v0.26.0 // indirect
21+
github.com/prometheus/procfs v0.6.0 // indirect
22+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
23+
google.golang.org/protobuf v1.26.0-rc.1 // indirect
24+
)

go.sum

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
105105
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
106106
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
107107
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
108-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
109108
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
110109
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
111110
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -120,16 +119,12 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w
120119
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
121120
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
122121
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
123-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
124122
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
125-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
126123
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
127124
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
128125
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
129-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
130126
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
131127
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
132-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
133128
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
134129
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
135130
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

vendor/github.com/cespare/xxhash/v2/go.mod

Lines changed: 0 additions & 3 deletions
This file was deleted.

vendor/github.com/cespare/xxhash/v2/go.sum

Whitespace-only changes.

vendor/github.com/prometheus/procfs/go.mod

Lines changed: 0 additions & 9 deletions
This file was deleted.

vendor/github.com/prometheus/procfs/go.sum

Lines changed: 0 additions & 8 deletions
This file was deleted.

vendor/modules.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# github.com/beorn7/perks v1.0.1
2+
## explicit; go 1.11
23
github.com/beorn7/perks/quantile
34
# github.com/cespare/xxhash/v2 v2.1.1
5+
## explicit; go 1.11
46
github.com/cespare/xxhash/v2
57
# github.com/genuinetools/amicontained v0.4.3
68
## explicit
79
github.com/genuinetools/amicontained/container
810
# github.com/golang/protobuf v1.4.3
11+
## explicit; go 1.9
912
github.com/golang/protobuf/proto
1013
github.com/golang/protobuf/ptypes
1114
github.com/golang/protobuf/ptypes/any
@@ -16,37 +19,41 @@ github.com/golang/protobuf/ptypes/timestamp
1619
github.com/ibm-messaging/mq-golang/ibmmq
1720
github.com/ibm-messaging/mq-golang/mqmetric
1821
# github.com/matttproud/golang_protobuf_extensions v1.0.1
22+
## explicit
1923
github.com/matttproud/golang_protobuf_extensions/pbutil
2024
# github.com/prometheus/client_golang v1.11.1
21-
## explicit
25+
## explicit; go 1.13
2226
github.com/prometheus/client_golang/prometheus
2327
github.com/prometheus/client_golang/prometheus/internal
2428
github.com/prometheus/client_golang/prometheus/promhttp
2529
# github.com/prometheus/client_model v0.2.0
26-
## explicit
30+
## explicit; go 1.9
2731
github.com/prometheus/client_model/go
2832
# github.com/prometheus/common v0.26.0
33+
## explicit; go 1.11
2934
github.com/prometheus/common/expfmt
3035
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
3136
github.com/prometheus/common/model
3237
# github.com/prometheus/procfs v0.6.0
38+
## explicit; go 1.13
3339
github.com/prometheus/procfs
3440
github.com/prometheus/procfs/internal/fs
3541
github.com/prometheus/procfs/internal/util
3642
# github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
3743
## explicit
3844
github.com/syndtr/gocapability/capability
3945
# golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
40-
## explicit
46+
## explicit; go 1.17
4147
golang.org/x/crypto/bcrypt
4248
golang.org/x/crypto/blowfish
4349
golang.org/x/crypto/pbkdf2
4450
# golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
45-
## explicit
51+
## explicit; go 1.17
4652
golang.org/x/sys/internal/unsafeheader
4753
golang.org/x/sys/unix
4854
golang.org/x/sys/windows
4955
# google.golang.org/protobuf v1.26.0-rc.1
56+
## explicit; go 1.9
5057
google.golang.org/protobuf/encoding/prototext
5158
google.golang.org/protobuf/encoding/protowire
5259
google.golang.org/protobuf/internal/descfmt

0 commit comments

Comments
 (0)