This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-resolver-1.9.x
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/maven-resolver-1.9.x by this
push:
new e33cd949 [MRESOLVER-570] Remove excessive strictness of OSGi
dependency metadata
e33cd949 is described below
commit e33cd9495972ffbdf286df6cb942d25dbb36ddd3
Author: Hannes Wellmann <hannes.wellm...@iils.de>
AuthorDate: Wed Jun 19 15:38:57 2024 +0200
[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)
---
maven-resolver-impl/pom.xml | 12 ++++++++++++
pom.xml | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
index a1c88aa7..87f3d607 100644
--- a/maven-resolver-impl/pom.xml
+++ b/maven-resolver-impl/pom.xml
@@ -31,6 +31,18 @@
<name>Maven Artifact Resolver Implementation</name>
<description>An implementation of the repository system.</description>
+ <properties>
+ <bnd.instructions.additions><![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.instructions.additions>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
diff --git a/pom.xml b/pom.xml
index 387f886c..d6caaca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,6 +476,10 @@
Automatic-Module-Name: ${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.instructions.additions}
