Merge branch '1.11.x' into 1.12.x

micrometer-metrics · Mar 11, 2024 · 52075c6 · 52075c6
2 parents 04e4fd9 + 37bfdfd
commit 52075c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/micrometer-commons/build.gradle b/micrometer-commons/build.gradle
@@ -18,6 +18,7 @@ jar {
         bnd '''\
         Import-Package: \
             org.aspectj.*;resolution:=dynamic,\
+            javax.annotation.*;resolution:=optional;version="${@}",\
             *
         '''.stripIndent()
     }

diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -58,6 +58,7 @@ jar {
             rx.*;resolution:=dynamic;version="${@}",\
             javax.persistence.*;resolution:=dynamic;version="${@}",\
             io.netty.*;resolution:=dynamic;version="${@}",\
+            javax.annotation.*;resolution:=optional;version="${@}",\
             *
         '''.stripIndent()
     }