Make a custom release of sbt-osgi 0.9.4 + Invalid CEN extra data field patch

sbt / sbt-osgi

sbt plugin for creating OSGi bundles

Apache License 2.0

47 stars 43 forks source link

Make a custom release of sbt-osgi 0.9.4 + Invalid CEN extra data field patch #93

Closed mdedetrich closed 1 year ago

mdedetrich commented 1 year ago

At pekko we are using sbt-osgi and we have encountered a regression that occurred between 0.9.4 and 0.9.5 whereby there are duplicate classes/jars, see https://github.com/apache/incubator-pekko/issues/745#issuecomment-1772327770 for more info.

Ordinarily this regression wouldn't have been an issue since we could just stick to 0.9.4 but because of https://github.com/sbt/sbt-osgi/pull/81 0.9.4. no longer works. In the interests of unblocking pekko (currently both the main and 1.0.x branches are broken due to this) would it be possible to create patched release of 0.9.4. containing https://github.com/sbt/sbt-osgi/pull/81 ?

In my mind I would create a new branch based off of 0.9.4, cherry picking the relevant build/org updates along with the patch and then we can cut a release by pushing a git tag (I was thinking 0.9.4-INVALID-CEN-JAR-PATCH?)

@eed3si9n @xuwei-k @romainreuillon thoughts?

eed3si9n commented 1 year ago

I'm ok with whatever approach that unblocks you folks, but I guess a better approach would be to bisect to identify the regression and revert it.

mdedetrich commented 1 year ago

I'm ok with whatever approach that unblocks you folks, but I guess a better approach would be to bisect to identify the regression and revert it.

I would normally do this but because of the pressure that Pekko has to unbreak the branches and/or whether reverting that commit won't cause more problems (I assume it was done for a reason).

In any case I will go ahead and make the branch

lefou commented 1 year ago

Probably related: https://github.com/sbt/sbt-osgi/issues/75

My hope was, that PR #79 might fix it. @mdedetrich could you please test this PR?

lefou commented 1 year ago

In case, #75 is related, an potential workaround is described here: https://github.com/akka/akka/issues/31437#issuecomment-1158798110

mdedetrich commented 1 year ago

@lefou Sure, I just initiated a release of v0.9.4-INVALID-CEN-JAR-PATCH just to unblock pekko but I can look at those PR's to see if it fixes these issues.

mdedetrich commented 1 year ago

Closing as completed, can confirm that v0.9.4-INVALID-CEN-JAR-PATCH works and both branches of pekko are now unblocked. Will now continue to proceed to properly fix the regression.

mdedetrich commented 1 year ago

Probably related: Race condition in the dependencies of the osgiBundle task #75

My hope was, that PR #79 might fix it. @mdedetrich could you please test this PR?

@lefou I can confirm that this didn't fix the underlying issue, at least with Pekko

lefou commented 1 year ago

Probably related: Race condition in the dependencies of the osgiBundle task #75

My hope was, that PR #79 might fix it. @mdedetrich could you please test this PR?

@lefou I can confirm that this didn't fix the underlying issue, at least with Pekko

Too bad. Thanks for checking.