Skip to content

Commit

Permalink
[MRESOLVER-570] Remove excessive strictness of OSGi dependency metadata
Browse files Browse the repository at this point in the history
- Mark optional Maven dependencies as optional in OSGi metadata
- Widen version range for org.slf4j.spi package to [1.7,3)
  • Loading branch information
iils-hwellmann committed Jun 21, 2024
1 parent 353ce1f commit 711341d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
15 changes: 15 additions & 0 deletions maven-resolver-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,21 @@
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<configuration>
<bnd><![CDATA[
# Mark optional Maven dependencies as optional
Import-Package: \
org.slf4j.spi;version="[1.7,3)", \
javax.inject;resolution:=optional,\
com.google.inject*;resolution:=optional, \
org.eclipse.sisu*;resolution:=optional, \
*
]]></bnd>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 4 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,10 @@
Bundle-SymbolicName: ${Bundle-SymbolicName}
# Export packages not containing the substring 'internal'
-exportcontents: ${removeall;${packages};${packages;NAMED;*internal*}}
# Mark optional Maven dependencies as optional
Import-Package: \
javax.inject*;resolution:=optional, \
*
# Reproducible build
-noextraheaders: true
]]></bnd>
Expand Down

0 comments on commit 711341d

Please sign in to comment.