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

Upgrade Felix, OSGi and JRE. #56 #79

Merged
merged 2 commits into from
Dec 8, 2020

Conversation

pavelhoral
Copy link
Member

Dependency changes

  • ✔ JRE version was upgraded to 1.8.
  • ✔ Felix framework upgraded to 6.0.x.
  • ❌ Left a lot of dependencies at their old versions (e.g. Gogo Shell). We should continue with the upgrade after this gets merged.

Implementation changes (OSGi specific)

  • ✔ All Felix SCR Annotations were replaced with standard OSGi DS annotations.
  • ✔ Previous implementation was using factory=true with suppressMetatypeWarning properties to generate empty OCD. Such construct is not possible with DS and I am not sure what purpose it had. Those properties were removed.
  • ✔ Previous Felix SCR Maven plugin was automatically generating service.pid based on component name. This property is used on a lot of places in service lookup / filters. This approach is not possible with DS (see FELIX-5304). Service PID properties were removed where possible, however additional cleanup is still needed.

Bundle changes (metadata)

  • ❌ Link to Creative Commons license disappeared from Bundle-License manifest attribute. This was not an intentional change, but it probably doesn't matter as CC-BY-NC was for docbook documentation.
  • ✔ Newer build produces more exhaustive Import-Packages configuration. Seems to be in the direction of best-practices and should be ok.

Known (unrelated) issues

@pavelhoral
Copy link
Member Author

pavelhoral commented Dec 3, 2020

Seems like Semaphore is having some issues with the build (will need to investigate a bit). I know I will have to deal with PGP artifact signatures, but the project builds and runs fine on my computer.

* Switch from Felix SCR annotations to OSGi DS.
* Remove service.pid property where possible (FELIX-5304).
@pavelhoral
Copy link
Member Author

pavelhoral commented Dec 7, 2020

Every issue has been hopefully resolved. PR is ready to be merged (rebased & squashed).

@karelmaxa karelmaxa self-requested a review December 8, 2020 07:44
Copy link
Member

@karelmaxa karelmaxa left a comment

Choose a reason for hiding this comment

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

LGTM!

@karelmaxa karelmaxa merged commit 2b53707 into WrenSecurity:master Dec 8, 2020
@karelmaxa karelmaxa deleted the feature-56 branch December 8, 2020 12:54
@pavelhoral pavelhoral changed the title Upgrade Felix, OSGi and JRE. Upgrade Felix, OSGi and JRE. #56 Dec 9, 2020
@pavelhoral pavelhoral linked an issue Dec 9, 2020 that may be closed by this pull request
@pavelhoral pavelhoral linked an issue Dec 9, 2020 that may be closed by this pull request
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.

Upgrade OSGi and Apache Felix versions Replace SCR with OSGi's official DS annotations
2 participants