diff options
| author | Matthias Sohn | 2020-01-23 09:44:25 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2020-01-26 20:18:42 +0000 |
| commit | 8a4df85dede958744c8084ed571c77e7a99bb875 (patch) | |
| tree | aaefe32fff9d3d1d01fa3479da27a8c3e07b997c | |
| parent | 3e417114a87351744f82c7b16af453ce04e10293 (diff) | |
| download | orbit-recipes-8a4df85dede958744c8084ed571c77e7a99bb875.tar.gz orbit-recipes-8a4df85dede958744c8084ed571c77e7a99bb875.tar.xz orbit-recipes-8a4df85dede958744c8084ed571c77e7a99bb875.zip | |
Require and reexport bundle org.hamcrest 1.3 in org.junit 4.13
JUnit 4.13 has a mandatory dependency on hamcrest-core and hamcrest has
split packages hence require the hamcrest-core bundle and reexport it
for downstream users.
Bug: 559224
Change-Id: I7e56e6e767ee693b989b042272ef6f71994eed38
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | junit/junit4/org.junit_4.13.0/osgi.bnd | 15 | ||||
| -rw-r--r-- | junit/junit4/org.junit_4.13.0/pom.xml | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/junit/junit4/org.junit_4.13.0/osgi.bnd b/junit/junit4/org.junit_4.13.0/osgi.bnd index 220496af..30c10109 100644 --- a/junit/junit4/org.junit_4.13.0/osgi.bnd +++ b/junit/junit4/org.junit_4.13.0/osgi.bnd @@ -1,10 +1,15 @@ -package-version=${version;===;${Bundle-Version}} -hamcrest-core-version-range=${range;[===,+);1.3}hamcrest-core-version=${version;===;1.3} +junit-version=${version;===;${Bundle-Version}} +junit-version-range=${range;[==,=+);${junit-version}} +hamcrest-version-range=${range;[==,+);1.3} Export-Package: \ !about.html,!about_files, \ - *.internal.*;x-internal:=true;version="${package-version}", \ - *;version="${package-version}" + *.internal.*;x-internal:=true;version="${junit-version}", \ + *;version="${junit-version}" Import-Package: \ - *;resolution:=optional + junit.*;version="${junit-version-range}", \ + org.junit.*;version="${junit-version-range}" + +Require-Bundle: \ + org.hamcrest.core;bundle-version="${hamcrest-version-range}";visibility:=reexport
\ No newline at end of file diff --git a/junit/junit4/org.junit_4.13.0/pom.xml b/junit/junit4/org.junit_4.13.0/pom.xml index 40d52c4a..c57807e4 100644 --- a/junit/junit4/org.junit_4.13.0/pom.xml +++ b/junit/junit4/org.junit_4.13.0/pom.xml @@ -18,4 +18,8 @@ <version>4.13</version> </dependency> </dependencies> + <properties> + <!-- Permit the use of Require-Bundle (in osgi.bnd file) --> + <recipe.removeadditionalheaders></recipe.removeadditionalheaders> + </properties> </project> |