This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 602aacdcf1db8e12cd021bbe562b3ebff220787b Author: Claus Ibsen <[email protected]> AuthorDate: Thu Jun 10 14:34:31 2021 +0200 More osgi fixes --- .../apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java | 4 +--- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_11.adoc | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java index fe56dc4..78c58bd 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetrySetter.java @@ -16,14 +16,12 @@ */ package org.apache.camel.opentelemetry.propagators; -import javax.annotation.Nullable; - import io.opentelemetry.context.propagation.TextMapSetter; import org.apache.camel.tracing.InjectAdapter; public class OpenTelemetrySetter implements TextMapSetter<InjectAdapter> { @Override - public void set(@Nullable InjectAdapter adapter, String key, String value) { + public void set(InjectAdapter adapter, String key, String value) { adapter.put(key, value); } } diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_11.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_11.adoc index 826b596..bf30a07 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_11.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_11.adoc @@ -77,3 +77,6 @@ Therefore those configurations has renamed their configuration keys: | camel.cloud.consul.service-registry | camel.cloud.consul |==== +=== Apache Karaf + +The `camel-grpc` feature has been removed. \ No newline at end of file
