Skip to content

chore: update bundle dependencies for v4.90.2 #4386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josephwoodward merged 3 commits into from
May 4, 2026
+2 −2
Merged

chore: update bundle dependencies for v4.90.2 #4386

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10d2bbb
chore: update bundle dependencies for v4.90.2
github-actions[bot] May 2, 2026
d3d2537
Merge branch 'main' into update-bundles-v4.90.2
josephwoodward May 4, 2026
775668b
Update go.mod to require connect v4.90.2
josephwoodward May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions public/bundle/enterprise/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ module github.com/redpanda-data/connect/public/bundle/enterprise/v4

go 1.26.2

<<<<<<< update-bundles-v4.90.2
require github.com/redpanda-data/connect/v4 v4.90.2
=======
require github.com/redpanda-data/connect/v4 v4.90.1
>>>>>>> main
Copy link
Copy Markdown

@claude claude Bot May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unresolved Git merge conflict markers (<<<<<<<, =======, >>>>>>>) were committed to this file. This will cause go mod operations and any build that depends on public/bundle/enterprise/go.mod to fail because the file is not valid Go module syntax.

Resolve the conflict by keeping the intended version (presumably require github.com/redpanda-data/connect/v4 v4.90.2, matching the bump in public/bundle/free/go.mod) and deleting the marker lines.


require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion public/bundle/free/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/redpanda-data/connect/public/bundle/free/v4

go 1.26.2

require github.com/redpanda-data/connect/v4 v4.90.1
require github.com/redpanda-data/connect/v4 v4.90.2

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1 // indirect
Expand Down