Skip to content

Fixed OSGI import version for Grizzly#6050

Merged
arjantijms merged 1 commit intoeclipse-ee4j:4.0.JPMSfrom
dmatej:grizzly5
Jan 14, 2026
Merged

Fixed OSGI import version for Grizzly#6050
arjantijms merged 1 commit intoeclipse-ee4j:4.0.JPMSfrom
dmatej:grizzly5

Conversation

@dmatej
Copy link
Contributor

@dmatej dmatej commented Jan 13, 2026

Note: I have noticed some issues with test stability (already without this change), I will try to improve it in standalone PR(s).

@dmatej
Copy link
Contributor Author

dmatej commented Jan 13, 2026

@senivam Could you do something with branch names? It is a mess, I am not sure which branch should be the target one. Why so old branch is the default one? Should I change it to 4.0 or 4.0.0-BRANCH is the right one? Why it declares 4.0.99-SNAPSHOT version as the next snapshot? I think it would be better to follow some Maven conventions.

image

@jansupol
Copy link
Contributor

Branch 4.0.0-Branch should be deleted, it is the release branch, from which is tag 4.0.0 created, I think.
There is branch 4.0 which does not have JPMS, and 4.0.JPMS which has it, and which is used as a main 4.0 branch with the support of JPMS.
Why do you want to restrict the grizzly to 3? Should it not be [3,6)? So that either Grizzly in GF works with Jersey?
Jersey used to have [3,4), then because of GF we updated to [3,5), so that we could integrate with whatever Grizzly comes and we do not block GF, now we probably should have [4,6).

@dmatej
Copy link
Contributor Author

dmatej commented Jan 13, 2026

Branch 4.0.0-Branch should be deleted, it is the release branch, from which is tag 4.0.0 created, I think. There is branch 4.0 which does not have JPMS, and 4.0.JPMS which has it, and which is used as a main 4.0 branch with the support of JPMS. Why do you want to restrict the grizzly to 3? Should it not be [3,6)? So that either Grizzly in GF works with Jersey? Jersey used to have [3,4), then because of GF we updated to [3,5), so that we could integrate with whatever Grizzly comes and we do not block GF, now we probably should have [4,6).

This doesn't restrict it to 3, but the meaning is 3 or later. Note that AI gives wrong answers, surprisingly SO is correct, see: https://stackoverflow.com/questions/8353771/osgi-valid-version-ranges/8354987#8354987
I tested it with Grizzly 5.0.0-SNAPSHOT and GlassFish 8.0.0-SNAPSHOT + other projects using Grizzly. Grizzly will move faster this year and releasing every projects after every its major version doesn't make sense if these dependencies really are not affected by changes in Grizzly which could be breaking for some projects - and for some not.

See also eclipse-ee4j/glassfish#25859 - just because Grizzly releases 5, we have to release some 5 projects despite they use still the same API. With Grizzly 6 it would repeat again for no reason.

@jansupol
Copy link
Contributor

Sounds ok, then. Can you rebase onto a different branch?

- We use 4.0.2 for build
- The range was limiting major upgrades of other projects while breaking
  changes in Grizzly still did not affect Jersey. Now we set just the minimal
  Grizzly version.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej dmatej changed the base branch from 4.0.0-BRANCH to 4.0.JPMS January 13, 2026 15:29
@dmatej
Copy link
Contributor Author

dmatej commented Jan 13, 2026

Sounds ok, then. Can you rebase onto a different branch?

Done, I hope this branch is the right one :-)

@senivam
Copy link
Contributor

senivam commented Jan 13, 2026

@dmatej - {version}-BRANCH branches are technical branches which are being created during a release process of a particular {version}. Usually they are merged back to the branches from which the release had occured and are being deleted aftewards. Some. hovever, are not merged yet that's why you are facing the mess .
The 2.x branche corresponds to the Jakarta 8 version of Jersey and is still maintained. All changes from it are propagated to the 3.0 (Jakarta 9), 3.1 (Jakarta 10) and 4.0 (Jakarta 11) branches. The 4.0.JPMS branch in for JPMS support of the Jakarta 11 Jersey. So, everything which is in the 4.0 is also released in the 4.0.JPMS with JPMS support.

@arjantijms
Copy link
Contributor

So, everything which is in the 4.0 is also released in the 4.0.JPMS with JPMS support.

Do we need the separate 4.0 branch still? Maybe just continue with 4.0.JPMS exclusively?

@senivam
Copy link
Contributor

senivam commented Jan 14, 2026

Do we need the separate 4.0 branch still? Maybe just continue with 4.0.JPMS exclusively?

@arjantijms - yes, good point, it was planned as you are saying - convert 4.0.JPMS into the 4.0 and by that replace the original 4.0 without JPMS. However, we are not 100% sure JPMS is totally fine, so that is why the original 4.0 branch is being kept.

@arjantijms arjantijms merged commit c19a4a1 into eclipse-ee4j:4.0.JPMS Jan 14, 2026
7 checks passed
@arjantijms
Copy link
Contributor

@senivam I renamed 4.0 to backup40branch, and renamed 4.0.JPMS to 4.x

@dmatej dmatej deleted the grizzly5 branch January 15, 2026 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants