Skip to content

Commit 687fa2f

Browse files
authored
chore: Upgrade google pubsub to v2 (#5733)
1 parent 789e8b3 commit 687fa2f

8 files changed

Lines changed: 133 additions & 137 deletions

File tree

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.24.0'
26+
go-version: '1.25.0'
2727

2828
- name: Install Groovy
2929
run: sudo apt-get update && sudo apt-get install groovy -y

.github/workflows/update-go-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.24.0'
16+
go-version: '1.25.0'
1717
- name: Perform update
1818
run: |
1919
git checkout -B gh-action-update-golang-dependencies

.github/workflows/upload-go-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.24.0'
16+
go-version: '1.25.0'
1717
- env:
1818
CGO_ENABLED: 0
1919
run: |

.github/workflows/verify-go.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- master
1010

1111
env:
12-
DEFAULT_GOLANG: '1.24.0'
12+
DEFAULT_GOLANG: '1.25.0'
1313

1414
jobs:
1515
unit:
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
- uses: actions/setup-go@v5
4848
with:
49-
go-version: '1.24.0'
49+
go-version: '1.25.0'
5050
- name: Cache Golang Packages
5151
uses: actions/cache@v3
5252
with:
@@ -66,7 +66,7 @@ jobs:
6666
steps:
6767
- uses: actions/setup-go@v5
6868
with:
69-
go-version: '1.24.0'
69+
go-version: '1.25.0'
7070
- name: checkout
7171
uses: actions/checkout@v4
7272
with:
@@ -81,7 +81,7 @@ jobs:
8181
steps:
8282
- uses: actions/setup-go@v5
8383
with:
84-
go-version: '1.24.0'
84+
go-version: '1.25.0'
8585
- name: Cache Golang Packages
8686
uses: actions/cache@v3
8787
with:
@@ -101,7 +101,7 @@ jobs:
101101
steps:
102102
- uses: actions/setup-go@v5
103103
with:
104-
go-version: '1.24.0'
104+
go-version: '1.25.0'
105105
- name: Cache Golang Packages
106106
uses: actions/cache@v3
107107
with:

go.mod

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/SAP/jenkins-library
22

3-
go 1.24.0
3+
go 1.25.0
44

55
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
66

77
require (
8-
cloud.google.com/go/pubsub v1.47.0
9-
cloud.google.com/go/storage v1.54.0
8+
cloud.google.com/go/pubsub/v2 v2.6.0
9+
cloud.google.com/go/storage v1.56.0
1010
dario.cat/mergo v1.0.1
1111
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
1212
github.com/BurntSushi/toml v1.5.0
@@ -28,7 +28,7 @@ require (
2828
github.com/go-git/go-billy/v5 v5.8.0
2929
github.com/go-git/go-git/v5 v5.18.0
3030
github.com/go-openapi/runtime v0.24.1
31-
github.com/go-openapi/strfmt v0.21.3
31+
github.com/go-openapi/strfmt v0.26.1
3232
github.com/go-playground/locales v0.14.1
3333
github.com/go-playground/universal-translator v0.18.1
3434
github.com/go-playground/validator/v10 v10.14.1
@@ -58,10 +58,10 @@ require (
5858
github.com/stretchr/testify v1.11.1
5959
github.com/testcontainers/testcontainers-go v0.33.0
6060
github.com/xuri/excelize/v2 v2.4.1
61-
golang.org/x/mod v0.31.0
62-
golang.org/x/oauth2 v0.34.0
63-
golang.org/x/text v0.33.0
64-
google.golang.org/api v0.232.0
61+
golang.org/x/mod v0.33.0
62+
golang.org/x/oauth2 v0.36.0
63+
golang.org/x/text v0.35.0
64+
google.golang.org/api v0.274.0
6565
gopkg.in/ini.v1 v1.67.0
6666
gopkg.in/yaml.v2 v2.4.0
6767
gopkg.in/yaml.v3 v3.0.1
@@ -72,14 +72,14 @@ require (
7272

7373
require (
7474
cel.dev/expr v0.25.1 // indirect
75-
cloud.google.com/go/auth v0.16.1 // indirect
75+
cloud.google.com/go/auth v0.18.2 // indirect
7676
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
7777
cloud.google.com/go/compute/metadata v0.9.0 // indirect
78-
cloud.google.com/go/monitoring v1.24.0 // indirect
78+
cloud.google.com/go/monitoring v1.24.3 // indirect
7979
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
80-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
81-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
82-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
80+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
81+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
82+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
8383
github.com/MakeNowJust/heredoc v1.0.0 // indirect
8484
github.com/Microsoft/hcsshim v0.11.7 // indirect
8585
github.com/agext/levenshtein v1.2.3 // indirect
@@ -111,6 +111,7 @@ require (
111111
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
112112
github.com/go-logr/stdr v1.2.2 // indirect
113113
github.com/go-ole/go-ole v1.2.6 // indirect
114+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
114115
github.com/google/gnostic-models v0.7.0 // indirect
115116
github.com/google/s2a-go v0.1.9 // indirect
116117
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
@@ -128,6 +129,7 @@ require (
128129
github.com/moby/sys/userns v0.1.0 // indirect
129130
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
130131
github.com/oapi-codegen/runtime v1.0.0 // indirect
132+
github.com/oklog/ulid/v2 v2.1.1 // indirect
131133
github.com/pjbgf/sha1cd v0.3.2 // indirect
132134
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
133135
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
@@ -145,18 +147,18 @@ require (
145147
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
146148
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
147149
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
148-
go.opentelemetry.io/otel v1.40.0 // indirect
149-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
150-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
151-
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
152-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
150+
go.opentelemetry.io/otel v1.43.0 // indirect
151+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
152+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
153+
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
154+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
153155
go.uber.org/multierr v1.11.0 // indirect
154156
go.uber.org/zap v1.27.0 // indirect
155157
go.yaml.in/yaml/v2 v2.4.2 // indirect
156158
go.yaml.in/yaml/v3 v3.0.4 // indirect
157159
golang.org/x/image v0.23.0 // indirect
158-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
159-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
160+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
161+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401001100-f93e5f3e9f0f // indirect
160162
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
161163
k8s.io/apiextensions-apiserver v0.34.2 // indirect
162164
k8s.io/component-base v0.34.2 // indirect
@@ -167,8 +169,8 @@ require (
167169
)
168170

169171
require (
170-
cloud.google.com/go v0.121.0 // indirect
171-
cloud.google.com/go/iam v1.5.2 // indirect
172+
cloud.google.com/go v0.123.0 // indirect
173+
cloud.google.com/go/iam v1.7.0 // indirect
172174
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 // indirect
173175
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
174176
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
@@ -179,7 +181,6 @@ require (
179181
github.com/Microsoft/go-winio v0.6.2 // indirect
180182
github.com/ProtonMail/go-crypto v1.1.6 // indirect
181183
github.com/antchfx/xpath v1.3.6 // indirect
182-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
183184
github.com/aws/aws-sdk-go-v2 v1.30.4 // indirect
184185
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
185186
github.com/aws/aws-sdk-go-v2/credentials v1.17.30 // indirect
@@ -212,7 +213,7 @@ require (
212213
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
213214
github.com/go-logr/logr v1.4.3 // indirect
214215
github.com/go-openapi/analysis v0.21.2 // indirect
215-
github.com/go-openapi/errors v0.20.2 // indirect
216+
github.com/go-openapi/errors v0.22.7 // indirect
216217
github.com/go-openapi/jsonpointer v0.21.0 // indirect
217218
github.com/go-openapi/jsonreference v0.20.2 // indirect
218219
github.com/go-openapi/loads v0.21.1 // indirect
@@ -225,8 +226,8 @@ require (
225226
github.com/google/btree v1.1.3 // indirect
226227
github.com/google/go-querystring v1.1.0 // indirect
227228
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
228-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
229-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
229+
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
230+
github.com/googleapis/gax-go/v2 v2.21.0 // indirect
230231
github.com/gorilla/mux v1.8.1 // indirect
231232
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
232233
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -261,7 +262,6 @@ require (
261262
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
262263
github.com/morikuni/aec v1.0.0 // indirect
263264
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
264-
github.com/oklog/ulid v1.3.1 // indirect
265265
github.com/onsi/ginkgo v1.16.5 // indirect
266266
github.com/opencontainers/go-digest v1.0.0 // indirect
267267
github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -282,17 +282,16 @@ require (
282282
github.com/xanzy/ssh-agent v0.3.3 // indirect
283283
github.com/xlab/treeprint v1.2.0 // indirect
284284
github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3 // indirect
285-
go.mongodb.org/mongo-driver v1.11.6 // indirect
286285
go.opencensus.io v0.24.0 // indirect
287-
golang.org/x/crypto v0.47.0
286+
golang.org/x/crypto v0.49.0
288287
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
289-
golang.org/x/net v0.49.0 // indirect
290-
golang.org/x/sync v0.19.0
291-
golang.org/x/sys v0.40.0 // indirect
292-
golang.org/x/term v0.39.0 // indirect
293-
golang.org/x/time v0.12.0 // indirect
294-
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
295-
google.golang.org/grpc v1.79.3 // indirect
288+
golang.org/x/net v0.52.0 // indirect
289+
golang.org/x/sync v0.20.0
290+
golang.org/x/sys v0.42.0 // indirect
291+
golang.org/x/term v0.41.0 // indirect
292+
golang.org/x/time v0.15.0 // indirect
293+
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
294+
google.golang.org/grpc v1.80.0 // indirect
296295
google.golang.org/protobuf v1.36.11 // indirect
297296
gopkg.in/inf.v0 v0.9.1 // indirect
298297
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)