Skip to content
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

[Jinja] Update JinJava version and embed dependencies #10496 #10578

Merged
merged 2 commits into from
Apr 25, 2021

Conversation

antroids
Copy link
Contributor

Related to #10496 openhab/openhab-osgiify#17 openhab/openhab-osgiify#18

All dependencies for JinJava 2.5.0 were resolved by OSGIified versions declared in feature.xml for some reason. This way requires PRs to openhab-osgiify repository on each dependency update and this is very inconvenient.
By this PR, dependencies used by Jinja Transformation are moved back to pom.xml. I left Jackson, Jsoup, commons-net and commons-lang3 in feature.xml, because they are used by other bundles and they have actual bundles in Maven repository.

Code review is required, because I have no experience in OSGi.

Anton Kharuzhy added 2 commits April 25, 2021 13:48
Signed-off-by: Anton Kharuzhy <antroids@gmail.com>
Signed-off-by: Anton Kharuzhy <antroids@gmail.com>
@antroids antroids requested a review from jochen314 as a code owner April 25, 2021 11:20
@wborn wborn added rebuild Triggers Jenkins PR build and removed rebuild Triggers Jenkins PR build labels Apr 25, 2021
Copy link
Member

@kaikreuzer kaikreuzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm and the right classes seem to get embedded into the jar.
It is hard to tell if everything is correct, but I guess you have tested it.
Thanks!

@kaikreuzer kaikreuzer added this to the 3.1 milestone Apr 25, 2021
@kaikreuzer kaikreuzer merged commit c0f7074 into openhab:main Apr 25, 2021
kaikreuzer added a commit to openhab/openhab-osgiify that referenced this pull request Apr 26, 2021
Related to openhab/openhab-addons#10578

Signed-off-by: Kai Kreuzer <kai@openhab.org>
wborn pushed a commit to openhab/openhab-osgiify that referenced this pull request Apr 26, 2021
Related to openhab/openhab-addons#10578

Signed-off-by: Kai Kreuzer <kai@openhab.org>
themillhousegroup pushed a commit to themillhousegroup/openhab2-addons that referenced this pull request May 10, 2021
…penhab#10578)

Signed-off-by: Anton Kharuzhy <antroids@gmail.com>
Signed-off-by: John Marshall <john.marshall.au@gmail.com>
@antroids antroids deleted the Jinja_Embed branch May 14, 2021 13:32
computergeek1507 pushed a commit to computergeek1507/openhab-addons that referenced this pull request Jul 13, 2021
frederictobiasc pushed a commit to frederictobiasc/openhab-addons that referenced this pull request Oct 26, 2021
thinkingstone pushed a commit to thinkingstone/openhab-addons that referenced this pull request Nov 7, 2021
marcfischerboschio pushed a commit to bosch-io/openhab-addons that referenced this pull request May 5, 2022
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.

3 participants