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

Resolve runbundles for Xtext and Jollyday upgrades #17509

Merged
merged 1 commit into from
Oct 6, 2024

Conversation

wborn
Copy link
Member

@wborn wborn commented Oct 5, 2024

Related to:

* openhab/openhab-core#4398
* openhab/openhab-core#4403

Signed-off-by: Wouter Born <github@maindrain.net>
@wborn wborn added the awaiting other PR Depends on another PR label Oct 5, 2024
@wborn wborn requested a review from a team October 5, 2024 09:11
@wborn wborn requested a review from antroids as a code owner October 5, 2024 09:11
Copy link
Member

@holgerfriedrich holgerfriedrich left a comment

Choose a reason for hiding this comment

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

I think this is just due to Jollyday update and also due to the update for mqtt.homeassist. Xtext is not contributing, or did I overlook something?

org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.yaml.snakeyaml;version='[2.2.0,2.2.1)'
org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
com.fasterxml.jackson.datatype.jackson-datatype-jdk8;version='[2.17.1,2.17.2)',\
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I just let the resolver do its thing because it knows best.

This bundle seems to be a requirement of org.openhab.osgiify/com.hubspot.jinjava.jinjava if I look at that bundle manifest.

Without it there are also errors in the test:

! Failed to start bundle com.hubspot.jinjava.jinjava-2.7.3, exception Could not resolve module: com.hubspot.jinjava.jinjava [99]
  Unresolved requirement: Import-Package: com.googlecode.ipv6; resolution:="optional"
  Unresolved requirement: Import-Package: com.fasterxml.jackson.datatype.jdk8

org.osgi.framework.BundleException: Could not resolve module: com.hubspot.jinjava.jinjava [99]
  Unresolved requirement: Import-Package: com.googlecode.ipv6; resolution:="optional"
  Unresolved requirement: Import-Package: com.fasterxml.jackson.datatype.jdk8

	at org.eclipse.osgi.container.Module.start(Module.java:463)
	at org.eclipse.osgi.internal.framework.EquinoxBundle.start(EquinoxBundle.java:445)
	at aQute.launcher.Launcher.start(Launcher.java:699)
	at aQute.launcher.Launcher.startBundles(Launcher.java:679)
	at aQute.launcher.Launcher.activate(Launcher.java:585)
	at aQute.launcher.Launcher.launch(Launcher.java:403)
	at aQute.launcher.Launcher.run(Launcher.java:185)
	at aQute.launcher.Launcher.main(Launcher.java:161)
	at aQute.launcher.pre.EmbeddedLauncher.executeWithRunPath(EmbeddedLauncher.java:170)
	at aQute.launcher.pre.EmbeddedLauncher.findAndExecute(EmbeddedLauncher.java:135)
	at aQute.launcher.pre.EmbeddedLauncher.main(EmbeddedLauncher.java:52)

If it is not required the bundle should have an optional import for this @ccutrer. Then you can also remove the bundle from the feature.xml file

Copy link
Contributor

Choose a reason for hiding this comment

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

https://mvnrepository.com/artifact/com.hubspot.jinjava/jinjava/2.7.3 lists it as a compile dependency. AFAIK that means it's not optional, no?

Copy link
Member Author

Choose a reason for hiding this comment

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

It is deprecated and integrated into other Jackson modules:

This module has become part of Jackson Java 8 Modules as of Jackson 2.8.5

https://github.com/FasterXML/jackson-datatype-jdk8

So it seems unnecessary for newer Jackson versions like 2.17.1 that OH uses.

Copy link
Member Author

Choose a reason for hiding this comment

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

I had a closer look and now see the artifact still exists in newer versions but it got moved to another repo:

https://github.com/FasterXML/jackson-modules-java8/tree/master/datatypes

It seems to be used for registering the Jdk8Module in Jackson:

https://github.com/search?q=repo%3AHubSpot%2Fjinjava%20jdk8module&type=code

The Jdk8Module is used for mapping optionals to null values:

https://github.com/FasterXML/jackson-datatype-jdk8/blob/master/src/main/java/com/fasterxml/jackson/datatype/jdk8/Jdk8Module.java

@holgerfriedrich holgerfriedrich added rebuild Triggers Jenkins PR build and removed rebuild Triggers Jenkins PR build labels Oct 5, 2024
@lolodomo lolodomo removed the awaiting other PR Depends on another PR label Oct 5, 2024
Copy link
Member

@holgerfriedrich holgerfriedrich left a comment

Choose a reason for hiding this comment

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

For now we need this to fix the build - maybe com.fasterxml.jackson.datatype.jackson-datatype-jdk8 can be made optional and removed here, but this is out of scope of this ticket.

@wborn wborn merged commit 4730f64 into openhab:main Oct 6, 2024
5 checks passed
@wborn wborn deleted the resolve-runbundles branch October 6, 2024 07:03
joni1993 pushed a commit to joni1993/openhab-addons that referenced this pull request Oct 15, 2024
matchews pushed a commit to matchews/openhab-addons that referenced this pull request Oct 18, 2024
@wborn wborn added this to the 4.3 milestone Nov 10, 2024
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