Skip to content

[2.9.x] oss.sonatype.org is dead (backport #13360) by @mkurz #13361

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

Jump to bottom
Merged
mkurz merged 1 commit into from
Jul 1, 2025
Merged

[2.9.x] oss.sonatype.org is dead (backport #13360) by @mkurz #13361

mkurz merged 1 commit into from
Jul 1, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2025

This is an automatic backport of pull request #13360 done by [Mergify](https://mergify.com).

@mergify
Copy link
Contributor Author

mergify bot commented Jul 1, 2025

Cherry-pick of 8e60bc9 has failed:

On branch mergify/bp/2.9.x/pr-13360
Your branch is up to date with 'origin/2.9.x'.

You are currently cherry-picking commit 8e60bc948.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   documentation/manual/working/commonGuide/build/code/dependencies.sbt
	modified:   project/BuildSettings.scala
	modified:   project/Docs.scala
	modified:   project/PlayBuildBase.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala
	both modified:   documentation/manual/hacking/Repositories.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jul 1, 2025
@mergify mergify bot mentioned this pull request Jul 1, 2025
Merged
@mkurz
oss.sonatype.org is dead
df1490f 
(cherry picked from commit 8e60bc9)

# Conflicts:
#	dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala
#	documentation/manual/hacking/Repositories.md
@mkurz mkurz force-pushed the mergify/bp/2.9.x/pr-13360 branch from 65d526f to df1490f Compare July 1, 2025 11:26
@mkurz mkurz merged commit 68d9dc5 into 2.9.x Jul 1, 2025
25 checks passed
@mkurz mkurz deleted the mergify/bp/2.9.x/pr-13360 branch July 1, 2025 12:14
@mkurz mkurz added this to the 2.9.8 milestone Jul 1, 2025
@mkurz mkurz removed the conflicts label Jul 1, 2025
@mkurz mkurz removed this from the 2.9.8 milestone Jul 1, 2025
@mkurz mkurz added this to the 2.9.9 milestone Sep 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.9.9

Development

Successfully merging this pull request may close these issues.

2 participants

@mkurz