added missing versions for features and fixed assembly of jetty certificate bundle #547
Conversation
…ficate bundle Signed-off-by: Kai Kreuzer <kai@openhab.org>
pom.xml
Outdated
| @@ -60,6 +60,9 @@ | |||
| <sat.version>0.5.0</sat.version> | |||
| <slf4j.version>1.7.21</slf4j.version> | |||
| <xtext.version>2.14.0</xtext.version> | |||
| <jetty.version>9.4.12.v20180830</jetty.version> | |||
There was a problem hiding this comment.
This Jetty version is used with Karaf 4.2.2 but not with Karaf 4.2.1 (still defined on line 59). See also the Karaf 4.2.2 upgrade changes.
If the goal is to make a working openhab-distro using the versions defined in this POM I think it's best to update Karaf to 4.2.2.
There was a problem hiding this comment.
FTR, this version is required here.
I just see that a Jetty version is defined in https://github.com/openhab/openhab-core/blob/master/features/karaf/openhab-tp/pom.xml#L17, so maybe it is best to move this one to https://github.com/openhab/openhab-core/blob/master/features/karaf/openhab-core/pom.xml then.
It would make the overall setup much simpler though, if we could simply say that openhab-core requires Karaf 4.2.2. @maggu2810 what's your take on this?
There was a problem hiding this comment.
I've moved the properties to the openhab-core feature for now - would suggest to merge it as is then (as it fixes a concrete bug that prevents the distro from being built), while I am open to discuss a general restructuring of features & versions for the future.
Signed-off-by: Kai Kreuzer <kai@openhab.org>
|
What's the reason to bundle all the bouncycastle classes to this bundle? -- I see it has been bundled before. |
|
I still rely on Karaf 4.2.1 and so on another Jetty version. |
It has always been like this and there was some good reason for it (which I don't remember now), so just let us leave it like that (it only broke by the bnd migration now, which I am fixing).
Ok, I didn't touch that for the tp feature - so we should be good to merge. |
Because the shade plugin didn't work with it - only without it. |
|
FTR, I am not trying to improve things here, I am just fixing stuff that broke through #467 and which prevent getting back to a successful distro build (which we didn't have for 2 weeks now). We definitely need to get that working again and this PR is hopefully the last missing piece. |
No need to blame my work. Perhaps I would not break the distro build for two weeks if there has been a little more feedback from other guys. |
|
No one depends on scope compile (default) stays that the dependency needs to be present at compile time and runtime (it will be transitive). As the bouncycastle packages are shaded, there should be no transitive dependency and no need that it needs to be present at runtime (because the respective packages are bundled). This should to be improved -- adding packages of other bundles should be done using the bnd.bnd file instead of further Maven plugins. |
Sorry, I didn't mean to blame you - we were all aware that things will break and have to be fixed, but my hope was that we are through by end of Jan with that, that's why I am meanwhile a bit nervous that there's still no distro build. I only wanted to point out that some things accidentially got lost and that this PR is bringing them back (and not meaning to do that in a future-proof and nice way). So instead of blaming you, I only wanted to excuse that I am not fixing it in a proper way. Thanks for merging! |
…ficate bundle (openhab#547) Signed-off-by: Kai Kreuzer <kai@openhab.org> GitOrigin-RevId: 4d9de63
Signed-off-by: Kai Kreuzer kai@openhab.org