search

jakartaee / servlet

Jakarta Servlet
https://eclipse.org/ee4j/servlet
Other
250 stars 79 forks source link

Merge 6.1.0 release into master #654

Closed arjantijms closed 2 weeks ago

arjantijms commented 3 weeks ago

According to https://github.com/jakartaee/servlet/issues/651

pzygielo commented 3 weeks ago

Could the error https://github.com/jakartaee/servlet/actions/runs/9227838949/job/25390577146?pr=654#step:5:2728 be fixed within this PR to not pollute master with non-buildable state?

markt-asf commented 3 weeks ago

Not sure we really need to do this. I think renaming the 6.1.0 branch to 6.1.x and updating master to 6.2.0(-SNAPSHOT) would get us to where we need to be.

arjantijms commented 3 weeks ago

Not sure we really need to do this.

It's partially common practice, but also the exact commit that made 6.1.0 a fact would not be in the 6.2.0 branch then, right? Not sure if that's an issue by itself.

But most (all?) projects do it like this.

markt-asf commented 2 weeks ago

I guess I am -0 on this. I don;t really see the point but no objection. I'll rename the 6.1.0 branch to 6.0.x once you are done.

arjantijms commented 2 weeks ago

@markt-asf it is done

markt-asf commented 2 weeks ago

Tx. Branch renamed. I'll update the master branch to 6.2.x shortly.