From b192bf12ad2af92bba0f32c9d3127b1192e54670 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Mon, 4 Jun 2018 20:40:08 +0200
Subject: [PATCH] Update conscrypt to 1.1.3 which fixes some NPEs during tests
 when using conscrypt. (#8001)

Motivation:

When using conscrypt some NPEs were logged, these were fixed in the latest release.

Modifications:

Update to conscrypt 1.1.3.

Result:

Fixes https://github.com/netty/netty/issues/7988.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4cb89d220c..71e3e4b2da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
     <tcnative.classifier>${os.detected.classifier}</tcnative.classifier>
     <conscrypt.groupId>org.conscrypt</conscrypt.groupId>
     <conscrypt.artifactId>conscrypt-openjdk-uber</conscrypt.artifactId>
-    <conscrypt.version>1.1.2</conscrypt.version>
+    <conscrypt.version>1.1.3</conscrypt.version>
     <conscrypt.classifier />
     <jni.classifier>${os.detected.name}-${os.detected.arch}</jni.classifier>
     <logging.config>${project.basedir}/../common/src/test/resources/logback-test.xml</logging.config>