Generator-jhipster: Rename the default branch from `master` to `main`

[deepu105]

Hey let's rename the master branch in JHipster repos and beat GitHub to it

@jhipster/developers

Context: https://www.zdnet.com/article/github-to-replace-master-with-alternative-term-to-avoid-slavery-references/#:~:text=GitHub%20is%20working%20on%20replacing,its%20CEO%20said%20on%20Friday.

[pascalgrimaud]

@deepu105 : I didn't follow closely the debate on social network, but is there a final official decision about this ?
For me, there is nothing urgent here. If "main" is not the new official name, we must rename to another one again

[deepu105]

ok then let's wait to see what GitHub comes up with

[jdubois]

Yes, let's use the new default, that's perfect!
I hope it won't be too much work on the currently opened pull requests.

[atomfrede]

Mark from the Spring Data Team has already build a script which renames the primary branch to main for all repositories under one org. https://twitter.com/mp911de/status/1271785736547729408 https://github.com/mp911de/rename-to-main

I think I have read somewhere when doing it via gh api existing PRs are updated automatically, but I can't find the reference anymore.

[jdubois]

Could we test this on the hipster-labs org first? Or on one of our own personal repos? If the PRs are updated automatically, then there's no need to think a lot about this, let's just do it.

[atomfrede]

Dave Syer got covered the retargeting of open PRs: https://github.com/dsyer/main-branch-switch

[sendilkumarn]

You can test this on jhipster-kotlin 👍

[jdubois]

Reading https://twitter.com/lukaseder/status/1273187350911291393 I believe we will have the same issue. I know I'm doing this quite often, and I'm probably not the only one.
So at the very least we should check if we have some "master" references in our own documentation.

[atomfrede]

At least CONTRIBUTING.md must be changed (although it is not a link to the master branch)

[deepu105]

IMO its worth all the trouble if it helps to improve diversity and helps to
fight systematic racism

On Wed, 17 Jun 2020, 2:06 pm Frederik Hahne, [e-mail]
wrote:

At least CONTRIBUTING.md must be changed (although it is not a link to
the master branch)

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
https://github.com/jhipster/generator-jhipster/issues/11935#issuecomment-645333534,
or unsubscribe
https://github.com/notifications/unsubscribe-auth/AAIOKF6KJPXQDWCN25QKRUDRXCWTRANCNFSM4N6AEDWQ
.

[atomfrede]

Definitely. We should do it. And if we miss some parts first it's easy to change it afterwards.

[SudharakaP]

Just for reference, I believe by end of this year GitHub will support this natively and probably it's easier to wait until then;

https://github.com/github/renaming/

And currently they have done parts of it; https://github.blog/changelog/2020-07-22-github-actions-better-support-for-alternative-default-branch-names/

[mraible]

I'm ready to do this now. It's soooooo easy. PRs will suffer, but maybe that's the motivation for us to merge stuff?!

https://www.hanselman.com/blog/EasilyRenameYourGitDefaultBranchFromMasterToMain.aspx

[vishal423]

I think we should wait for https://github.com/github/renaming/ to have a good developer experience

[pascalgrimaud]

We should wait for patch release v6.10.4 before doing this too
Then, we can start with small repositories before doing the main repository

[SudharakaP]

I'll do this in jhipster-online after v6.10.4 is released (and end of year) and maybe we can use that as a test run to see if everything works correctly. 😄

Refer: https://github.com/jhipster/jhipster-online/issues/246

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-devbox

• https://github.com/jhipster/jhipster-devbox/issues/123
• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster-devbox/pull/124

[pascalgrimaud]

Done for https://github.com/jhipster/react-jhipster

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/react-jhipster/pull/56

[pascalgrimaud]

Done for https://github.com/jhipster/ng-jhipster

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/ng-jhipster/pull/133

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-registry

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster-registry/pull/477

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-control-center

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster-control-center/pull/109

[pascalgrimaud]

Done for https://github.com/jhipster/generator-jhipster-module

• create branch main from master
• protect main
• edit existing pull requests
• some updates : https://github.com/jhipster/generator-jhipster-module/pull/138

[pascalgrimaud]

Done for https://github.com/jhipster/generator-jhipster-blueprint

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/generator-jhipster-blueprint/pull/156

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-registry-sample-config

• create branch main from master
• protect main
• edit existing pull requests

[pascalgrimaud]

Done for https://github.com/jhipster/consul-config-loader

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/consul-config-loader/pull/28

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-artwork

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster-artwork/pull/10

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-fisher-plugin

• create branch main from master
• protect main
• edit existing pull requests

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-oh-my-zsh-plugin

• create branch main from master
• protect main
• edit existing pull requests

[pascalgrimaud]

Done for https://github.com/jhipster/jdl-samples

• create branch main from master
• protect main
• edit existing pull requests

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-base

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster-base/pull/18

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-guides

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster-guides/pull/31

[deepu105]

I thought we were gonna wait for GitHub to support this

[pascalgrimaud]

I had some time this afternoon, looking the Roland Garros final :tennis: :-)

[pascalgrimaud]

Done for https://github.com/jhipster/eslint-config-jhipster

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/eslint-config-jhipster/pull/7

[mraible]

Does the rename for JDL-samples require code changes since the JDL command reads from it?

On Oct 11, 2020, at 09:22, Pascal Grimaud [e-mail] wrote:


Done for https://github.com/jhipster/eslint-config-jhipster

create branch main from master
protect main
edit existing pull requests
some updates: jhipster/eslint-config-jhipster#7
—
You are receiving this because you are on a team that was mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.

[pascalgrimaud]

yes probably @mraible but I didn't delete master branch so it should still work for now
I didn't start the work yet for generator-jhipster, it will be the 'final boss'

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster-automated-samples

• create branch main from master
• protect main

Done for all the samples too:
https://github.com/jhipster/jhipster-sample-app
https://github.com/jhipster/jhipster-sample-app-react
https://github.com/jhipster/jhipster-sample-app-gradle
https://github.com/jhipster/jhipster-sample-app-mongodb
https://github.com/jhipster/jhipster-sample-app-couchbase
https://github.com/jhipster/jhipster-sample-app-cassandra
https://github.com/jhipster/jhipster-sample-app-dto
https://github.com/jhipster/jhipster-sample-app-elasticsearch
https://github.com/jhipster/jhipster-sample-app-hazelcast
https://github.com/jhipster/jhipster-sample-app-nocache
https://github.com/jhipster/jhipster-sample-app-noi18n
https://github.com/jhipster/jhipster-sample-app-websocket
https://github.com/jhipster/jhipster-sample-app-oauth2
https://github.com/jhipster/jhipster-sample-app-gateway
https://github.com/jhipster/jhipster-sample-app-microservice

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster.github.io

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster.github.io/pull/1021

[pascalgrimaud]

Done for https://github.com/jhipster/jhipster (cc @DanielFran)

• create branch main from master
• protect main
• edit existing pull requests
• some updates: https://github.com/jhipster/jhipster/pull/879

[pascalgrimaud]

done for https://github.com/jhipster/generator-jhipster

• [x] create branch main from master
• [x] protect main
• [x] edit existing pull requests
• [x] change main as default branch
• [x] some updates: https://github.com/jhipster/generator-jhipster/pull/12718

[jdubois]

Thank you so much for your hard work @pascalgrimaud

[avdev4j]

I'm taking those from Quarkus.

[amanganiello90]

Yes, I done for :

• https://github.com/jhipster/jhipster-sample-app-nodejs
• https://github.com/jhipster/jhipster-sample-app-nodejs-oauth2
• https://github.com/jhipster/generator-jhipster-nodejs

But I haven't settings permissions for the last in order to change the default.

@deepu105 Could you help me?

[pascalgrimaud]

@amanganiello90 : I added you as admin for the repo https://github.com/jhipster/generator-jhipster-nodejs

[deepu105]

I'll update the Go repos. JDL studio doesn't need to change as it doesn't have a master branch and src contains source and gh-pages contain the build

[mraible]

I updated generator-jhipster-ionic to use main as the default branch.

https://github.com/oktadeveloper/generator-jhipster-ionic https://github.com/oktadeveloper/generator-jhipster-ionic

On Oct 12, 2020, at 3:05 AM, Deepu K Sasidharan [e-mail] wrote:

I'll update the Go repos. JDL studio doesn't need to change as it doesn't have a master branch and src contains source and gh-pages contain the build

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub https://github.com/jhipster/generator-jhipster/issues/11935#issuecomment-706987712, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAELZBFUJOWGTV4M45ZPZDSKLBGDANCNFSM4N6AEDWQ.

[nicolas63]

done for :
https://github.com/jhipster/jhipster-dotnetcore
https://github.com/jhipster/jhipster-net
https://github.com/jhipster/jhipster-sample-app-dotnetcore

this repository is deprecated
https://github.com/jhipster/jhipster-net-sample-app-template

[pascalgrimaud]

I forgot Azure Pipelines, so I just configure it to point to main branch instead of master, for these projects:

• generator-jhipster
• jhipster
  It means all recent PRs don't have Azure Pipelines -> cc @mshima

All other projects should use GitHub Actions instead of Azure Pipelines.
If someone needs to configure Azure Pipelines for one of these projects, don't hesitate to ping me.

[JasonTypesCodes]

It appears that neither @atomfrede @mraible or myself have rights to change the default branch on https://github.com/jhipster/generator-jhipster-micronaut/

See: https://github.com/jhipster/generator-jhipster-micronaut/issues/191

[mshima]

Same for me for https://github.com/jhipster/generator-jhipster-jooq

[pascalgrimaud]

@JasonTypesCodes : just added you to admin team for Micronaut projects

[pascalgrimaud]

@mshima : I created a new team jOOQ admins and added you

[mshima]

@mshima : I created a new team jOOQ admins and added you

Done.

[DanielFran]

@pascalgrimaud Everything has been migrated.
Can this be closed?

[pascalgrimaud]

no, unfortunately, it's not finished yet...

Still to do on my side:

• check all Sonar analysis
• check all configuration at Azure DevOps (there are a lot of projects...), unless we decide to migrate to GitHub Actions

[avdev4j]

@SudharakaP @pascalgrimaud FYI the jhipser-bot used in the JHipster online is still creating master branch we creating a new project.

I don't think we noticed that ;)

[pascalgrimaud]

@avdev4j : I think it's because this PR https://github.com/jhipster/jhipster-online/pull/255 is not deployed to GCP yet

[avdev4j]

great !

[pascalgrimaud]

What was done:

• Azure DevOps should be configured correctly for active project (JHipster Kotlin)
• All SonarCloud projects should use main branch
• at Docker Hub:
  
  
  
  • jhipster
  
  
  • jhipster-online
  
  
  • jhipster-registry
  
  
  • consul-config-loader
  
  
  • jhipster-control-center
  
  

I think all work is done so the ticket can be closed !

[pascalgrimaud]

The last thing to do will be to delete the master branch
But I prefer to do it next year (in january 2021) so all our users can update their module / blueprint

[pascalgrimaud]

Bounty claimed at https://opencollective.com/generator-jhipster/expenses/28148