Skip to content

Commit e33cd94

Browse files
iils-hwellmanngnodet
authored andcommitted
[MRESOLVER-570] Remove excessive strictness of OSGi dependency metadata
- Mark optional Maven dependencies as optional in OSGi metadata - Widen version range for org.slf4j.spi package to [1.7,3)
1 parent 52b4db3 commit e33cd94

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

maven-resolver-impl/pom.xml

+12
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@
3131
<name>Maven Artifact Resolver Implementation</name>
3232
<description>An implementation of the repository system.</description>
3333

34+
<properties>
35+
<bnd.instructions.additions><![CDATA[
36+
# Mark optional Maven dependencies as optional
37+
Import-Package: \
38+
org.slf4j.spi;version="[1.7,3)", \
39+
javax.inject;resolution:=optional,\
40+
com.google.inject*;resolution:=optional, \
41+
org.eclipse.sisu*;resolution:=optional, \
42+
*
43+
]]></bnd.instructions.additions>
44+
</properties>
45+
3446
<dependencies>
3547
<dependency>
3648
<groupId>org.apache.maven.resolver</groupId>

pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,10 @@
476476
Automatic-Module-Name: ${Bundle-SymbolicName}
477477
# Export packages not containing the substring 'internal'
478478
-exportcontents: ${removeall;${packages};${packages;NAMED;*internal*}}
479+
# Mark optional Maven dependencies as optional
480+
Import-Package: \
481+
javax.inject*;resolution:=optional, \
482+
*
479483
# Reproducible build
480484
-noextraheaders: true
481485
${bnd.instructions.additions}

0 commit comments

Comments
 (0)