diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 53b0cefff1f9..807dc9f4e871 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -88,15 +88,6 @@ Licensed under the MIT License. 1.5.4 - - org.apache.logging.log4j log4j-api diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index 9b42a6a5d7ac..5905769907be 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -50,38 +50,12 @@ Licensed under the MIT License. com.azure azure-security-keyvault-keys 4.3.0-beta.1 - - - - - com.azure - azure-core - - com.azure azure-identity 1.2.0-beta.1 - - - - - com.azure - azure-core - - - - - io.netty - * - - com.fasterxml.jackson.module diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdClientChannelHandler.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdClientChannelHandler.java index 7f060bc4688e..5774d1f6c69d 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdClientChannelHandler.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/rntbd/RntbdClientChannelHandler.java @@ -12,6 +12,7 @@ import io.netty.channel.pool.ChannelPool; import io.netty.channel.pool.ChannelPoolHandler; import io.netty.handler.logging.LoggingHandler; +import io.netty.handler.ssl.SslHandler; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.AttributeKey; import org.slf4j.Logger; @@ -113,7 +114,9 @@ protected void initChannel(final Channel channel) { } pipeline.addFirst( - this.config.sslContext().newHandler(channel.alloc()), + // TODO (DANOBLE) Log an issue with netty + // Initialize sslHandler with jdkCompatibilityMode = true for openssl context. + new SslHandler(this.config.sslContext().newEngine(channel.alloc())), new IdleStateHandler( idleConnectionTimerResolutionInNanos, idleConnectionTimerResolutionInNanos,