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.

Sign up for GitHub

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

Jump to bottom

Replace content of o.e.osgi.services by osgi-bundles from Maven-Central #30

Merged
merged 2 commits into from
Jun 18, 2022
Merged

Replace content of o.e.osgi.services by osgi-bundles from Maven-Central #30

merged 2 commits into from
Jun 18, 2022

Conversation

HannesWell
Copy link
Member

This PR was originally created as eclipse-equinox/equinox.framework#44 and is now moved to this repository due to the merge of the equinox.framework and equinox.bundles repository.

As discussed in #18, this replaces all possible embedded osgi-sources of org.eclipse.osgi.services by corresponding osgi-bundles from Maven-Central.

These are:

  • org.osgi.service.cm
  • org.osgi.service.component
  • org.osgi.service.device
  • org.osgi.service.event
  • org.osgi.service.metatype
  • org.osgi.service.provisioning
  • org.osgi.service.upnp
  • org.osgi.service.useradmin
  • org.osgi.service.wireadmin

As a side effect this updates the versions of

  • org.osgi.service.component.* 1.4.0 -> 1.5.0

To comply with the Eclipse deprecation/removal process the replaced packages are not removed entirely but their content is replaced by requiring and re-exporting the provided osgi-bundles from Maven-Central. Bundles that require-bundle org.eclipse.osgi.services directly continue to work.

This was referenced Jun 16, 2022
Closed
Closed
Closed
@HannesWell HannesWell marked this pull request as draft June 16, 2022 23:56
@github-actions
Copy link

github-actions bot commented Jun 17, 2022 •
edited
Loading

Unit Test Results

   139 files     139 suites   23m 39s ⏱️
2 088 tests 2 043 ✔️ 44 💤 1 ❌
2 176 runs  2 131 ✔️ 44 💤 1 ❌

For more details on these failures, see this check.

Results for commit 91f7b89.

♻️ This comment has been updated with latest results.

This was referenced Jun 17, 2022
Merged
Merged
tjwatson
tjwatson approved these changes Jun 17, 2022
View reviewed changes
Copy link
Contributor

@tjwatson tjwatson left a comment

Choose a reason for hiding this comment

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

Looks good. Although I don't really know about the releng changes. Not to say they are wrong. Just that I don't know enough about it to know if it is correct. I approve to allow progress.

@HannesWell
Copy link
Member Author

Looks good. Although I don't really know about the releng changes. Not to say they are wrong. Just that I don't know enough about it to know if it is correct. I approve to allow progress.

Great. Thank you.

Are you referring to the .target file I added with the third commit? The third commit was just a temporary addition to be able to test the staged felix.scr artifacts in this build before it was released to maven-central and included in the platform.aggregator target.
I will remove the third commit entirely before submitting this PR (and likely squash commit one and two).

@tjwatson
Copy link
Contributor

Are you referring to the .target file I added with the third commit?

Yes I just did not realize it was a separate commit.

@HannesWell HannesWell marked this pull request as ready for review June 18, 2022 07:54
@HannesWell
Replace content of o.e.osgi.services by osgi-bundles from Maven-Central
e24d99b 
And update to latest version of
- org.osgi.service.cm
- org.osgi.service.component
- org.osgi.service.device
- org.osgi.service.event
- org.osgi.service.metatype
- org.osgi.service.provisioning
- org.osgi.service.upnp
- org.osgi.service.useradmin
- org.osgi.service.wireadmin

The package org.osgi.service.log is cleared in favor of the same package
provided by the org.eclipse.osgi system-bundle.

Discussed in issue:
eclipse-equinox#18
@HannesWell
Add OSGi-service bundles to features to make their sources available
91f7b89 
This is part of the work for:
eclipse-equinox#18
@HannesWell
Copy link
Member Author

The org.eclipse.equinox.ds.tests.tbc.DSTest.testCircularityHandling that failed in the GH-build did not fail on Jenkins and also not on the runs before (which used the staged artifacts that should be the same). Therefore I suspect that it is not a permanent issue. -> Submitting.

@HannesWell HannesWell merged commit e28f62f into eclipse-equinox:master Jun 18, 2022
@HannesWell HannesWell deleted the osgiServicesPackages branch June 18, 2022 08:38
@laeubi
Copy link
Member

laeubi commented Jun 18, 2022

See #25 it seems sometimes it fails and sometimes not...

@HannesWell
Copy link
Member Author

See #25 it seems sometimes it fails and sometimes not...

Good to know. Thanks!

@vogella vogella mentioned this pull request Nov 1, 2022
Closed
laeubi pushed a commit to laeubi/equinox that referenced this pull request Jan 19, 2023
@HannesWell
[RelEng] Perform code freeze period check in GitHub workflow (eclipse…
69bdbfc 
…-equinox#30)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tjwatson tjwatson tjwatson approved these changes

@bjhargrave bjhargrave Awaiting requested review from bjhargrave

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@HannesWell @tjwatson @laeubi