Skip to content

chore: bump to akka-http to 10.7.0-M1, akka to 2.10.0-M1, align with changes from upstream#1977

Merged
johanandren merged 2 commits intoakka:mainfrom
sebastian-alfers:bump-akka-2.10.0-M1
Sep 24, 2024
Merged

chore: bump to akka-http to 10.7.0-M1, akka to 2.10.0-M1, align with changes from upstream#1977
johanandren merged 2 commits intoakka:mainfrom
sebastian-alfers:bump-akka-2.10.0-M1

Conversation

@sebastian-alfers
Copy link
Copy Markdown
Contributor

@sebastian-alfers sebastian-alfers commented Sep 24, 2024

No description provided.

@sebastian-alfers
Copy link
Copy Markdown
Contributor Author

sebastian-alfers commented Sep 24, 2024

The error is:

[info] [error] Deduplicate found different file contents in the following:
[info] [error]   Jar name = gson-2.10.1.jar, jar org = com.google.code.gson, entry target = META-INF/versions/9/module-info.class
[info] [error]   Jar name = slf4j-api-2.0.16.jar, jar org = org.slf4j, entry target = META-INF/versions/9/module-info.class

Will push an update to the merge strategy.

johanandren
johanandren approved these changes Sep 24, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@johanandren johanandren left a comment

Choose a reason for hiding this comment

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

LGTM

@johanandren johanandren merged commit 102313a into akka:main Sep 24, 2024
@ennru ennru mentioned this pull request Sep 24, 2024
Closed
@sebastian-alfers sebastian-alfers mentioned this pull request Sep 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@johanandren johanandren johanandren approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sebastian-alfers @johanandren