Hi,
I find the shorter branch names a bit better (just because shorter is
better), as long as we do not release multiple independent projects from
the same git repo.
At the same time I would not mind to start using the longer branch names
ones if other Camel family members prefer them.
The same discussion could be lead about tag names where Camel Quarkus
also uses the short form equal to the released version - e.g. 2.2.0 .
Camel's tags always have the 'camel-' prefix.
In case of tags, I must say I am much stronger in favor of the short
form, because it is much simpler for any human or tool wanting to map a
specific artifact version to a SCM tag. E.g. on GitHub I can type
/<org>/<project>/tree/<version>/some/file to the address line without
too much thinking about any prefixes. I personally use this with tags
much more often than with branches. Also typing `git log 2.1.0..2.2.0`
is much less work than `git log camel-quarkus-2.1.0..camel-quarkus-2.2.0`.
I am hereby not intending to propose this for other Camel subprojects. I
just wanted to bring forward some practical advantages of shorter tag
names :)
Thanks,
-- Peter
On 24/09/2021 16:16, Claus Ibsen wrote:
On Fri, Sep 24, 2021 at 3:57 PM Zineb Bendhiba <[email protected]> wrote:
Claus,
Should we use camel-quarkus-2.3.x for the next release instead of 2.3.x ?
Oh I think we should maybe create a new thread on @dev to get all the
Camel projects aligned to the same branch names for releases and tags.
This also helps with cleanup as we end up with a bunch of stale
branches, and sometimes you may be in doubt if something can be
removed or not.
Le ven. 24 sept. 2021 à 15:40, Claus Ibsen <[email protected]> a écrit :
On Fri, Sep 24, 2021 at 3:37 PM James Netherton
<[email protected]> wrote:
Zoran raised this a while back which resulted in this issue:
https://github.com/apache/camel-quarkus/issues/2853
We started using the new convention from the last release:
https://github.com/apache/camel-quarkus/tree/2.2.x
Ah thanks yeah so we can switch the website to use this now.
Next gritty thing would maybe to use same naming convention in all our
Camel project, today they are different,
but there should be something to complain about next year also ;)
--
James
On Fri, 24 Sept 2021 at 08:12, Claus Ibsen <[email protected]>
wrote:
Hi
The branches for camel-quarkus is not similar to the other Camel
project / sub-projects
For example for camel-k, we have
origin/release-1.0.x
origin/release-1.1.x
origin/release-1.2.x
origin/release-1.3.x
origin/release-1.4.x
origin/release-1.5.x
origin/release-1.6.x
And for camel-karaf
origin/camel-karaf-3.10.x
origin/camel-karaf-3.11.x
origin/camel-karaf-3.2.x
origin/camel-karaf-3.3.x
origin/camel-karaf-3.4.x
origin/camel-karaf-3.5.x
origin/camel-karaf-3.6.x
origin/camel-karaf-3.7.x
origin/camel-karaf-3.8.x
origin/camel-karaf-3.9.x
And so on
In other words, we use a branch name with the major.minor.x as suffix.
The camel-quarkus project does not, and we should get this aligned
going
forward
origin/release-1.0.0-M6-attempt2
origin/release-1.0.0-M7
origin/release-1.0.0_M6-release4
origin/release/1.0.0
origin/release/1.0.0-CR2
origin/release/1.1.0
origin/release/1.2.0
origin/release/1.3.0
origin/release/1.4.0
origin/release/1.5.0
origin/release/1.6.0
origin/release/1.7.0
origin/release/1.8.0
origin/release/1.8.1
origin/release/2.0.0
origin/release/2.0.0-M1
origin/release/2.0.0-M2
origin/release/2.1.0
We should use .x so 2.1.0 is 2.1.x and so on.
Also the last release is 2.2.0 and there is no branch for this.
We need to get this aligned so we can ensure the website documentation
is also maintainable.
This file controls what gets published on the website
https://github.com/apache/camel-website/blob/main/antora-playbook.yml
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2
--
Zineb
