From 37b5260cdd091255260b6e7ac65410d473969c2d Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Tue, 12 Jun 2018 19:06:18 +0200
Subject: [PATCH 1/3] Fix DNSUtil.setDaneProvider()

Fixes SMACK-820.
---
 .../org/jivesoftware/smack/util/DNSUtil.java     |  2 +-
 .../org/jivesoftware/smack/util/DnsUtilTest.java | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
index fb4c55eb6..8ffcf64b6 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
@@ -72,7 +72,7 @@ public class DNSUtil {
      * @param daneProvider
      */
     public static void setDaneProvider(SmackDaneProvider daneProvider) {
-        daneProvider = Objects.requireNonNull(daneProvider);
+        DNSUtil.daneProvider = Objects.requireNonNull(daneProvider);
     }
 
     /**
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/DnsUtilTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/DnsUtilTest.java
index 7e7038118..626a3d4f4 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/DnsUtilTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/DnsUtilTest.java
@@ -19,6 +19,8 @@ package org.jivesoftware.smack.util;
 import static org.junit.Assert.assertEquals;
 
 import org.jivesoftware.smack.util.DNSUtil.DomainType;
+import org.jivesoftware.smack.util.dns.SmackDaneProvider;
+import org.jivesoftware.smack.util.dns.SmackDaneVerifier;
 
 import org.junit.Test;
 
@@ -33,4 +35,18 @@ public class DnsUtilTest {
         assertEquals(DNSUtil.XMPP_SERVER_DNS_SRV_PREFIX, server.srvPrefix.ace);
     }
 
+    private static final SmackDaneProvider DNS_UTIL_TEST_DANE_PROVIDER = new SmackDaneProvider() {
+        @Override
+        public SmackDaneVerifier newInstance() {
+            throw new AssertionError();
+        }
+    };
+
+    @Test
+    public void daneProviderTest() {
+        DNSUtil.setDaneProvider(DNS_UTIL_TEST_DANE_PROVIDER);
+        SmackDaneProvider currentDaneProvider = DNSUtil.getDaneProvider();
+
+        assertEquals(DNS_UTIL_TEST_DANE_PROVIDER, currentDaneProvider);
+    }
 }

From 21f0be58dfb0a32bdd1ab6400b11e358202d66a6 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Sun, 17 Jun 2018 13:49:29 +0200
Subject: [PATCH 2/3] Smack 4.3.0-rc1

---
 version.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.gradle b/version.gradle
index cb120112e..19bbd3726 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,7 +1,7 @@
 allprojects {
 	ext {
 		shortVersion = '4.3.0-rc1'
-		isSnapshot = true
+		isSnapshot = false
 		jxmppVersion = '0.6.2'
 		miniDnsVersion = '0.3.0'
 		smackMinAndroidSdk = 9

From 651ee7b85e40be5d4359c75b2c5858862cd533cc Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Sun, 17 Jun 2018 14:10:12 +0200
Subject: [PATCH 3/3] Smack 4.3.0-rc2-SNAPSHOT

---
 version.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.gradle b/version.gradle
index 19bbd3726..f71298a5e 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,7 +1,7 @@
 allprojects {
 	ext {
-		shortVersion = '4.3.0-rc1'
-		isSnapshot = false
+		shortVersion = '4.3.0-rc2'
+		isSnapshot = true
 		jxmppVersion = '0.6.2'
 		miniDnsVersion = '0.3.0'
 		smackMinAndroidSdk = 9