diff options
| author | Roland Grunberg | 2018-09-07 18:06:30 +0000 |
|---|---|---|
| committer | Roland Grunberg | 2018-09-19 13:50:05 +0000 |
| commit | 13cf7279ab6883f2ad405fa5b05ae378a9eec266 (patch) | |
| tree | 8b7757d3ff8f1eebfcd70f3300b0b3c8453a9dfd | |
| parent | 2ef690b01d85d89f16dc3d5104da1cfb467f22b4 (diff) | |
| download | orbit-recipes-13cf7279ab6883f2ad405fa5b05ae378a9eec266.tar.gz orbit-recipes-13cf7279ab6883f2ad405fa5b05ae378a9eec266.tar.xz orbit-recipes-13cf7279ab6883f2ad405fa5b05ae378a9eec266.zip | |
Fix some resolution issues with certain bundles.
- Fix split packaging issue in slf4j.ext 1.7.10.
- Prevent commons.codec 1.9 from depending on commons.codec 1.10
Change-Id: If9c854d31352e6efbdaba97f77da1e1f4876bd80
| -rw-r--r-- | apache/org.apache.commons.codec_1.9.0/osgi.bnd | 1 | ||||
| -rw-r--r-- | logging/org.slf4j.ext_1.7.10/osgi.bnd | 4 | ||||
| -rw-r--r-- | logging/org.slf4j.ext_1.7.10/pom.xml | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/apache/org.apache.commons.codec_1.9.0/osgi.bnd b/apache/org.apache.commons.codec_1.9.0/osgi.bnd index e45d4cea..11742e7a 100644 --- a/apache/org.apache.commons.codec_1.9.0/osgi.bnd +++ b/apache/org.apache.commons.codec_1.9.0/osgi.bnd @@ -7,5 +7,6 @@ Export-Package: \ *;version="${package-version}" Import-Package: \ + org.apache.commons.codec*;version="${range;[===,=+);${package-version}}";resolution:=optional, \ *;resolution:=optional diff --git a/logging/org.slf4j.ext_1.7.10/osgi.bnd b/logging/org.slf4j.ext_1.7.10/osgi.bnd index 1defe83c..3a308074 100644 --- a/logging/org.slf4j.ext_1.7.10/osgi.bnd +++ b/logging/org.slf4j.ext_1.7.10/osgi.bnd @@ -7,6 +7,8 @@ Export-Package: \ *.impl*;x-internal:=true;version="${package-version}", \ *;version="${package-version}" +Require-Bundle: org.slf4j.api;bundle-version="${range;[===,=+);${package-version}}" + Import-Package: \ - org.slf4j.*;version="${range;[===,=+);${package-version}}", \ + !org.slf4j*, \ *;resolution:=optional diff --git a/logging/org.slf4j.ext_1.7.10/pom.xml b/logging/org.slf4j.ext_1.7.10/pom.xml index 84a15ff5..fbaa677e 100644 --- a/logging/org.slf4j.ext_1.7.10/pom.xml +++ b/logging/org.slf4j.ext_1.7.10/pom.xml @@ -38,4 +38,9 @@ </plugins> </build> + <properties> + <!-- Permit the use of Require-Bundle (in osgi.bnd file) --> + <recipe.removeadditionalheaders></recipe.removeadditionalheaders> + </properties> + </project> |