-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue #6354 - OSGI manifest for slf4j-api packages lower limit should be 1.7 #6381
Conversation
… be 1.7 Signed-off-by: Joakim Erdfelt <[email protected]>
The Eclipse IDE side issue that needs the OSGI manifest fix from this PR is ... |
@nitind this appears to resolve the WTP problem that "jetty-jndi and jetty-plus did not have their SLF4J ranges lowered under 2.0". Are you able to test to see if the 10.0.5 snapshot that @joakime put out resolves that and means that no slf4j 2 ends up in https://download.eclipse.org/webtools/jetty/10.0.4/repository/plugins/ equivalent? |
I haven't pushed the SNAPSHOT with the PR changes yet. |
Signed-off-by: Joakim Erdfelt <[email protected]>
@jonahgraham I should be able to once the snapshots are up, but the process we use for our build doesn't modify the manifests aside from embedding SHA-256-Digests within them, so what Jetty creates is basically what we use. |
I had to push a small fix in commit 8193af6 - i'm going to wait for CI to give a green light before i build the snapshot for you. |
@nitind @jonahgraham snapshots deployed to https://oss.sonatype.org/content/repositories/jetty-snapshots |
All of the manifests look good to me. Output from my local build still includes a slf4j.api_2.0.0.alpha1.jar, but that must be because it's technically newer and not a snapshot. |
@nitind feel free to approve the PR ;) |
I suspect there are two reasons it is included:
If that sounds correct, then perhaps this change to Platform's build can be applied to WTPs too? https://git.eclipse.org/r/c/platform/eclipse.platform.releng.buildtools/+/181742 |
Signed-off-by: Jan Bartel <[email protected]>
We need to make sure that the osgi tests run against I've made the So, AFAICT the fix in this PR works, however, I think it is an extremely fragile fix: the next person who creates a jetty module that specifies a custom A far better solution would be to make all of jetty rely on the lowest level of So now that I've committed code to this branch, I think we need to ask somebody else to review this. |
pom.xml
Outdated
@@ -45,6 +45,9 @@ | |||
<jetty.perf-helper.version>1.0.6</jetty.perf-helper.version> | |||
<ant.version>1.10.9</ant.version> | |||
<unix.socket.tmp></unix.socket.tmp> | |||
<!-- OSGI import-package --> | |||
<osgi.common.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.common.import.packages> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This property should be renamed to slf4j.import.packages
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I considered that, as that is how it is currently used.
But using the more generic osgi.common.*
prefix means we can add to this list for other reasons without having to touch all of the locations that use this new property again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about osgi.slf4j.import.packages
?
I don't what to drop the osgi
portion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed to osgi.slf4j.import.packages
instead in commit 4720f07
Signed-off-by: Joakim Erdfelt <[email protected]>
Thank you Jetty team for all your work supporting the 2021-06 Eclipse SimRel release! Can you give us an ETA / time-range for a possible 10.0.5 release? The 2021-06 ship date is Wed 16 and the planning council needs some guidance so that we can start planning for a slip on the release day if needed. AFAICT the release engineering to respin is happening in (at least) 4 very disparate different timezones (Australia, India, Germany, Canada). Thanks again! |
@jonahgraham we are processing the release in #6390. I'm merging the latest PR and then I will deploy a 10.0.5-SNAPSHOT; I will notify here when the snapshot is deployed. Will be great if you can thoroughly test that snapshot and confirm that it works. |
The existing OSGi manifests for org.slf4j in Jetty 10.0.4 are broken.
They list only 1 out of the 4 packages that need import, and a few or our modules did not pull in the updated version range properly.
This PR fixes the top level configuration to include all 4 packages, and uses it in modules that declare their own
Import-Package
specifics.Signed-off-by: Joakim Erdfelt [email protected]