Merge branch '1.11.x' into 1.12.x

shakuzen · shakuzen · commit 52075c682e09 · 2024-03-11T22:58:35.000+09:00
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()
     }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ jar {`
`18`	`18`	`bnd '''\`
`19`	`19`	`Import-Package: \`
`20`	`20`	`org.aspectj.*;resolution:=dynamic,\`
	`21`	`+ javax.annotation.*;resolution:=optional;version="${@}",\`
`21`	`22`	`*`
`22`	`23`	`'''.stripIndent()`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ jar {`
`58`	`58`	`rx.*;resolution:=dynamic;version="${@}",\`
`59`	`59`	`javax.persistence.*;resolution:=dynamic;version="${@}",\`
`60`	`60`	`io.netty.*;resolution:=dynamic;version="${@}",\`
	`61`	`+ javax.annotation.*;resolution:=optional;version="${@}",\`
`61`	`62`	`*`
`62`	`63`	`'''.stripIndent()`
`63`	`64`	`}`