Re: Time to create Tomcat 10.1.x and master->main migration

[Mark Thomas]

Answering various points raised in this thread...

On 18/05/2021 13:10, Emmanuel Bourg wrote:
> I don't think the 7.0.x branch should be removed, there is no harm
> keeping it.

Ack. The idea was to try and provide a clear indication that the branch 
was not being developed whilst not losing any history. It is easily 
reversible. I'm leaning towards trying it and reversing it if there is 
an issue but we could just as easily leave it and see what happens. No 
rush to make a decision on this. We said we'd wait until 3 months after 
EOL to do this sort of clean-up (after 2021-06-30).



On 18/05/2021 13:16, Romain Manni-Bucau wrote:
and
On 19/05/2021 14:02, Martin Grigorov wrote:
> -0 to break all clones and related toolings/automotion for hypothetical
> reasons, didn't pay in all projects which did AFAIK

The reasons aren't hypothetical. My $dayjob is with a large 
multi-national company and the feedback there is that some employees do 
find the "master" terminology problematic. Costs and benefits are 
difficult to quantify but I think this relatively small change is worth 
it for the message it sends regarding Tomcat being a welcoming community 
for all.


I'll do the bulk of the work (actually GitHub and an Infra script will 
do most of it). Each committer will then need to run


git branch -m master main
git fetch origin
git branch -u origin/main main

for each clone.

PRs etc will get rebased automatically.

I'm currently planning on doing this late Friday my time. I'll post to 
dev@ before and after so everyone is aware of the change.


Mark



On 18/05/2021 12:18, Mark Thomas wrote:

All,

Things are starting to move forward for Jakarta EE 10 so I think it is 
time for us to create the 10.1.x branch. At the same time, I'd like to 
switch our primary development branches from master to main for all our 
repos.


We would, therefore, end up with the following for the Tomcat repo:

main   - 10.1.x development
10.0.x - 10.0.x development/maintenance
9.0.x  - 9.0.x development/maintenance
8.5.x  - 8.5.x development/maintenance
7.0.x  - 7.0.x development/maintenance

There are some git commands each committer will need to run locally for 
each repo to switch from master to main.


I have also been looking into how we can "retire" the 7.0.x branch when 
the time comes (after end of June). I'd like to suggest the following:

- tag the HEAD of the 7.0.x branch as "7.0.x-archive"
- delete the 7.0.x branch

That way it won't appear in the list of branches but it is trivial to 
recreate if we need it.


I'd like to get the master->main rename completed and the 10.1.x 
development branch created towards the end of this week (unless there 
are objections or things we need to discuss further).


Comments?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Time to create Tomcat 10.1.x and master->main migration

[Martin Grigorov]

On Tue, May 18, 2021 at 3:16 PM Romain Manni-Bucau 
wrote:

> +1 to move forward even if jakarta is not yet adopted (there is a single
> time direction - at least at our scale ;))
> -0 to break all clones and related toolings/automotion for hypothetical
> reasons, didn't pay in all projects which did AFAIK
>

Same vote from me!


>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github <
> https://github.com/rmannibucau> |
> LinkedIn  | Book
> <
> https://www.packtpub.com/application-development/java-ee-8-high-performance
> >
>
>
> Le mar. 18 mai 2021 à 14:13, Emmanuel Bourg  a écrit :
>
> > Le 2021-05-18 14:10, Emmanuel Bourg a écrit :
> >
> > >> Comments?
> > >
> > > I don't think the 7.0.x branch should be removed, there is no harm
> > > keeping it.
> > >
> > > As for the master->main change I think that's a waste of time for all
> > > of us. i don't buy the argument that "master" is offensive, but by
> > > moving awa
> >
> > Grr message sent too quickly, sorry.
> >
> > I don't want to reopen the debate, please ignore my comment.
> >
> > Emmanuel Bourg
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> >
>

Re: Time to create Tomcat 10.1.x and master->main migration

[Coty Sutherland]

On Tue, May 18, 2021 at 7:34 AM Mark Thomas  wrote:

> All,
>
> Things are starting to move forward for Jakarta EE 10 so I think it is
> time for us to create the 10.1.x branch. At the same time, I'd like to
> switch our primary development branches from master to main for all our
> repos.
>
> We would, therefore, end up with the following for the Tomcat repo:
>
> main   - 10.1.x development
> 10.0.x - 10.0.x development/maintenance
> 9.0.x  - 9.0.x development/maintenance
> 8.5.x  - 8.5.x development/maintenance
> 7.0.x  - 7.0.x development/maintenance
>
> There are some git commands each committer will need to run locally for
> each repo to switch from master to main.
>
> I have also been looking into how we can "retire" the 7.0.x branch when
> the time comes (after end of June). I'd like to suggest the following:
> - tag the HEAD of the 7.0.x branch as "7.0.x-archive"
> - delete the 7.0.x branch
>
> That way it won't appear in the list of branches but it is trivial to
> recreate if we need it.
>
> I'd like to get the master->main rename completed and the 10.1.x
> development branch created towards the end of this week (unless there
> are objections or things we need to discuss further).
>
> Comments?
>

+1, happy to hear there's some movement on the spec :D


> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: Time to create Tomcat 10.1.x and master->main migration

[Raymond Augé]

+1

I think it's a great plan.

Ray

On Tue., May 18, 2021, 8:16 a.m. Romain Manni-Bucau, 
wrote:

> +1 to move forward even if jakarta is not yet adopted (there is a single
> time direction - at least at our scale ;))
> -0 to break all clones and related toolings/automotion for hypothetical
> reasons, didn't pay in all projects which did AFAIK
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github <
> https://github.com/rmannibucau> |
> LinkedIn  | Book
> <
> https://www.packtpub.com/application-development/java-ee-8-high-performance
> >
>
>
> Le mar. 18 mai 2021 à 14:13, Emmanuel Bourg  a écrit :
>
> > Le 2021-05-18 14:10, Emmanuel Bourg a écrit :
> >
> > >> Comments?
> > >
> > > I don't think the 7.0.x branch should be removed, there is no harm
> > > keeping it.
> > >
> > > As for the master->main change I think that's a waste of time for all
> > > of us. i don't buy the argument that "master" is offensive, but by
> > > moving awa
> >
> > Grr message sent too quickly, sorry.
> >
> > I don't want to reopen the debate, please ignore my comment.
> >
> > Emmanuel Bourg
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> >
>

Re: Time to create Tomcat 10.1.x and master->main migration

[Romain Manni-Bucau]

+1 to move forward even if jakarta is not yet adopted (there is a single
time direction - at least at our scale ;))
-0 to break all clones and related toolings/automotion for hypothetical
reasons, didn't pay in all projects which did AFAIK

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le mar. 18 mai 2021 à 14:13, Emmanuel Bourg  a écrit :

> Le 2021-05-18 14:10, Emmanuel Bourg a écrit :
>
> >> Comments?
> >
> > I don't think the 7.0.x branch should be removed, there is no harm
> > keeping it.
> >
> > As for the master->main change I think that's a waste of time for all
> > of us. i don't buy the argument that "master" is offensive, but by
> > moving awa
>
> Grr message sent too quickly, sorry.
>
> I don't want to reopen the debate, please ignore my comment.
>
> Emmanuel Bourg
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: Time to create Tomcat 10.1.x and master->main migration

[Emmanuel Bourg]

Le 2021-05-18 14:10, Emmanuel Bourg a écrit :


Comments?


I don't think the 7.0.x branch should be removed, there is no harm 
keeping it.


As for the master->main change I think that's a waste of time for all
of us. i don't buy the argument that "master" is offensive, but by
moving awa


Grr message sent too quickly, sorry.

I don't want to reopen the debate, please ignore my comment.

Emmanuel Bourg

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Time to create Tomcat 10.1.x and master->main migration

[Emmanuel Bourg]

Le 2021-05-18 13:18, Mark Thomas a écrit :

All,

Things are starting to move forward for Jakarta EE 10 so I think it is
time for us to create the 10.1.x branch. At the same time, I'd like to
switch our primary development branches from master to main for all
our repos.

We would, therefore, end up with the following for the Tomcat repo:

main   - 10.1.x development
10.0.x - 10.0.x development/maintenance
9.0.x  - 9.0.x development/maintenance
8.5.x  - 8.5.x development/maintenance
7.0.x  - 7.0.x development/maintenance

There are some git commands each committer will need to run locally
for each repo to switch from master to main.

I have also been looking into how we can "retire" the 7.0.x branch
when the time comes (after end of June). I'd like to suggest the
following:
- tag the HEAD of the 7.0.x branch as "7.0.x-archive"
- delete the 7.0.x branch

That way it won't appear in the list of branches but it is trivial to
recreate if we need it.

I'd like to get the master->main rename completed and the 10.1.x
development branch created towards the end of this week (unless there
are objections or things we need to discuss further).

Comments?


I don't think the 7.0.x branch should be removed, there is no harm 
keeping it.


As for the master->main change I think that's a waste of time for all of 
us. i don't buy the argument that "master" is offensive, but by moving 
awa


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Time to create Tomcat 10.1.x and master->main migration

[Rémy Maucherat]

On Tue, May 18, 2021 at 1:34 PM Mark Thomas  wrote:

> All,
>
> Things are starting to move forward for Jakarta EE 10 so I think it is
> time for us to create the 10.1.x branch. At the same time, I'd like to
> switch our primary development branches from master to main for all our
> repos.
>

Ah good news. I sort of wasn't expecting anything anymore ;)


>
> We would, therefore, end up with the following for the Tomcat repo:
>
> main   - 10.1.x development
> 10.0.x - 10.0.x development/maintenance
> 9.0.x  - 9.0.x development/maintenance
> 8.5.x  - 8.5.x development/maintenance
> 7.0.x  - 7.0.x development/maintenance
>

+1

>
> There are some git commands each committer will need to run locally for
> each repo to switch from master to main.
>
> I have also been looking into how we can "retire" the 7.0.x branch when
> the time comes (after end of June). I'd like to suggest the following:
> - tag the HEAD of the 7.0.x branch as "7.0.x-archive"
> - delete the 7.0.x branch
>
> That way it won't appear in the list of branches but it is trivial to
> recreate if we need it.
>

Good idea !


>
> I'd like to get the master->main rename completed and the 10.1.x
> development branch created towards the end of this week (unless there
> are objections or things we need to discuss further).
>
> Comments?
>

Rémy

>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Time to create Tomcat 10.1.x and master->main migration

[Mark Thomas]

All,

Things are starting to move forward for Jakarta EE 10 so I think it is 
time for us to create the 10.1.x branch. At the same time, I'd like to 
switch our primary development branches from master to main for all our 
repos.


We would, therefore, end up with the following for the Tomcat repo:

main   - 10.1.x development
10.0.x - 10.0.x development/maintenance
9.0.x  - 9.0.x development/maintenance
8.5.x  - 8.5.x development/maintenance
7.0.x  - 7.0.x development/maintenance

There are some git commands each committer will need to run locally for 
each repo to switch from master to main.


I have also been looking into how we can "retire" the 7.0.x branch when 
the time comes (after end of June). I'd like to suggest the following:

- tag the HEAD of the 7.0.x branch as "7.0.x-archive"
- delete the 7.0.x branch

That way it won't appear in the list of branches but it is trivial to 
recreate if we need it.


I'd like to get the master->main rename completed and the 10.1.x 
development branch created towards the end of this week (unless there 
are objections or things we need to discuss further).


Comments?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org