Skip to content

Commit 1a66316

Browse files
Explicitly exclude java.* from OSGI Import-Package
6.4.x versions of the bnd gradle plugin plugin did exclude java.* from Import-Package while 7.1.x seems not. Closes micrometer-metricsgh-6810
1 parent 1753af2 commit 1a66316

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

micrometer-commons/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies {
1212

1313
jar {
1414
bundle {
15-
1615
bnd '''\
1716
Import-Package: \
17+
!java.*,\
1818
org.aspectj.*;resolution:=dynamic,\
1919
org.slf4j.*;resolution:=dynamic,\
2020
javax.annotation.*;resolution:=optional;version="${@}",\

micrometer-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ compileTestKotlin {
2626

2727
jar {
2828
bundle {
29-
3029
bnd '''\
3130
Import-Package: \
31+
!java.*,\
3232
org.aspectj.*;resolution:=dynamic,\
3333
com.github.benmanes.caffeine.*;resolution:=dynamic;version="${@}",\
3434
net.sf.ehcache.*;resolution:=dynamic;version="${@}",\

micrometer-jakarta9/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ description 'Module for Jakarta 9+ based instrumentations'
22

33
jar {
44
bundle {
5-
65
bnd '''\
76
Import-Package: \
7+
!java.*,\
88
jakarta.jms.*;resolution:=dynamic;version="${@}",\
99
io.micrometer.observation.*;resolution:=dynamic;version="${@}",\
1010
*

micrometer-observation/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jar {
88
bundle {
99
bnd '''\
1010
Import-Package: \
11+
!java.*,\
1112
javax.servlet.*;resolution:=optional,\
1213
io.micrometer.context.*;resolution:=optional,\
1314
org.aspectj.*;resolution:=optional,\

0 commit comments

Comments
 (0)