Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tries to hone OSGi imports according to use #1252

Merged
merged 1 commit into from
Sep 11, 2020
Merged

Tries to hone OSGi imports according to use #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion brave-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<!-- use the same values in ../pom.xml -->
<zipkin.version>2.21.7</zipkin.version>
<zipkin-reporter.version>2.15.1</zipkin-reporter.version>
<zipkin-reporter.version>2.15.2</zipkin-reporter.version>
</properties>

<organization>
Expand Down
2 changes: 1 addition & 1 deletion context/jfr/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
5 changes: 3 additions & 2 deletions context/log4j12/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.CorrelationContext
# We use need to import to support brave.internal.CorrelationContext
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.context.log4j12
5 changes: 3 additions & 2 deletions context/log4j2/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.CorrelationContext
# We use need to import to support brave.internal.CorrelationContext
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.context.log4j2
5 changes: 3 additions & 2 deletions context/slf4j/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.CorrelationContext
# We use need to import to support brave.internal.CorrelationContext
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.context.slf4j
5 changes: 3 additions & 2 deletions instrumentation/dubbo-rpc/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.Platform
# We use need to import to support brave.internal.Platform
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.dubbo.rpc
5 changes: 3 additions & 2 deletions instrumentation/dubbo/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.Platform
# We use need to import to support brave.internal.Platform
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.dubbo
5 changes: 3 additions & 2 deletions instrumentation/grpc/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable,Platform,MapPropagationFields,PropagationFieldsFactory
# We use need to import to support brave.internal.Platform,MapPropagationFields,PropagationFieldsFactory
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.grpc
2 changes: 1 addition & 1 deletion instrumentation/http/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/httpasyncclient/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/httpclient/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/jersey-server/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
5 changes: 3 additions & 2 deletions instrumentation/jms/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.Throwables
# We use need to import to support brave.internal.Throwables
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.jms
2 changes: 1 addition & 1 deletion instrumentation/kafka-clients/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/messaging/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
5 changes: 3 additions & 2 deletions instrumentation/netty-codec-http/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.Platform
# We use need to import to support brave.internal.Platform
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.netty.http
2 changes: 1 addition & 1 deletion instrumentation/p6spy/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/rpc/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
5 changes: 3 additions & 2 deletions instrumentation/servlet/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# We use brave.internal.Nullable and brave.internal.Throwables
# We use need to import to support brave.internal.Throwables
# brave.internal.Nullable is not used at runtime.
Import-Package: \
!brave.internal*,\
brave.internal;braveinternal=true,\
*
Export-Package: \
brave.servlet
2 changes: 1 addition & 1 deletion instrumentation/spring-rabbit/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# We use brave.internal.Nullable, but nothing else internal.
# We use brave.internal.Nullable, but it is not used at runtime.
Import-Package: \
!brave.internal*,\
*
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

<!-- use the same values in bom/pom.xml -->
<zipkin.version>2.21.7</zipkin.version>
<zipkin-reporter.version>2.15.1</zipkin-reporter.version>
<zipkin-reporter.version>2.15.2</zipkin-reporter.version>

<!-- Ensure older versions of spring still work -->
<spring5.version>5.2.7.RELEASE</spring5.version>
Expand Down