Skip to content

Ports bnd-maven-plugin configuration to main #1866

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

Merged
merged 23 commits into from
Oct 19, 2023
Merged

Conversation

ppkarwasz
Copy link
Contributor

@ppkarwasz ppkarwasz commented Oct 18, 2023

This PR makes the necessary adjustments to port #1819 to the main branch.

Except the changes that were already performed in 2.x it:

  • removes explicit module-info.java descriptors: they will be replaced by automatically generated ones,
  • removes almost all META-INF/services entries: they will be generated by BND; some of the entries remain since the current BND configuration adds META-INF/services directly to the JAR, so they are invisible to the tests. We can change that.

This is part of #1830 and #1705.

ppkarwasz and others added 20 commits October 18, 2023 15:33
Differences in the module descriptor:
 * `java.management` is added to the optional requires.

Differences in the OSGi descriptor:
 * the import statement on `sun.reflect` disappears,
 * an import statement on `org.apache.logging.log4j.internal` appears.
The following packages are no longer exported:

 *  org.apache.logging.log4j.core.layout.internal
 *  org.apache.logging.log4j.core.message
 *  org.apache.logging.log4j.core.time.internal
 *  org.apache.logging.log4j.core.tools.picocli
 *  org.apache.logging.log4j.core.util.internal

A new JPMS module is generated, which sets the following Java modules as
optional:
 *  java.compiler,
 *  java.logging,
 *  java.naming,
 *  java.sql.

All the new 3.x modules are configured to use BND.
In order to prevent API breaking changes, this:
 * adds [`bnd-baseline-maven-plugin`](https://github.com/bndtools/bnd/tree/master/maven-plugins/bnd-baseline-maven-plugin),
 * fix the API changes that would require a major version bump,
 * set the OSGi version of each packages to `2.20.1` or `2.21.0`,
   depending on the kind of changes the package underwent since the
   `2.20.0` release.
@ppkarwasz ppkarwasz merged commit 196159c into apache:main Oct 19, 2023
@ppkarwasz ppkarwasz deleted the bnd-main branch November 21, 2023 17:44
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.

2 participants