From c0dd8be0b02d853017975baba03a5215e804431a Mon Sep 17 00:00:00 2001
From: kalleboll <76847050+kalleboll@users.noreply.github.com>
Date: Wed, 20 Jan 2021 16:56:53 +0100
Subject: [PATCH] [tellstick] Fixes NoClassDefFoundError (#9634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7024

The problem was caused by the asynchttpclient dependency that seemed to require another version of the Netty dependency than what is added by the openhab.tp-netty feature.
This caused some of the classes in the ssl package to not be found during initialization.
I fixed it by upgrading the asynchttpclient dependency to a version that use the same version of Netty that is bundled(4.1.42.Final).

Signed-off-by: Jörgen Nilsson <mail.jnilsson@gmail.com>
---
 CODEOWNERS                                    |  2 +-
 bundles/org.openhab.binding.tellstick/pom.xml | 24 ++++++++++++++++---
 .../src/main/feature/feature.xml              |  4 ++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 9cb676a5c0f..e6e9168c9cf 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -256,7 +256,7 @@
 /bundles/org.openhab.binding.tankerkoenig/ @dolic @JueBag
 /bundles/org.openhab.binding.telegram/ @ZzetT
 /bundles/org.openhab.binding.teleinfo/ @Nokyyz
-/bundles/org.openhab.binding.tellstick/ @jarlebh
+/bundles/org.openhab.binding.tellstick/ @openhab/add-ons-maintainers
 /bundles/org.openhab.binding.tesla/ @kgoderis
 /bundles/org.openhab.binding.tibber/ @kjoglum
 /bundles/org.openhab.binding.tivo/ @mlobstein
diff --git a/bundles/org.openhab.binding.tellstick/pom.xml b/bundles/org.openhab.binding.tellstick/pom.xml
index 1555fce694d..7cbdf84d00a 100644
--- a/bundles/org.openhab.binding.tellstick/pom.xml
+++ b/bundles/org.openhab.binding.tellstick/pom.xml
@@ -16,7 +16,7 @@
 
   <properties>
     <bnd.importpackage>!com.luckycatlabs.*,!com.jcraft.jzlib.*,!org.apache.commons.cli.*,!org.eclipse.swt.*</bnd.importpackage>
-    <dep.noembedding>netty-transport-native-unix-common,netty-common,netty-transport,netty-transport-native-epoll,netty-buffer,netty-resolver,netty-codec,netty-codec-http,netty-handler</dep.noembedding>
+    <dep.noembedding>netty-transport-native-unix-common,netty-common,netty-transport,netty-transport-native-epoll,netty-buffer,netty-resolver,netty-codec,netty-codec-http,netty-handler,netty-transport-native-kqueue,netty-handler-proxy,netty-codec-socks</dep.noembedding>
   </properties>
 
   <dependencies>
@@ -36,13 +36,13 @@
     <dependency>
       <groupId>org.asynchttpclient</groupId>
       <artifactId>async-http-client</artifactId>
-      <version>2.0.19</version>
+      <version>2.10.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.asynchttpclient</groupId>
       <artifactId>async-http-client-netty-utils</artifactId>
-      <version>2.0.19</version>
+      <version>2.10.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -105,6 +105,24 @@
       <version>4.1.42.Final</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-kqueue</artifactId>
+      <version>4.1.42.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler-proxy</artifactId>
+      <version>4.1.42.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-socks</artifactId>
+      <version>4.1.42.Final</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.reactivestreams</groupId>
       <artifactId>reactive-streams</artifactId>
diff --git a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
index 7fc59a9d82b..1a473d4de86 100644
--- a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
@@ -9,6 +9,10 @@
 		<feature dependency="true">openhab.tp-jaxb</feature>
 		<bundle dependency="true">mvn:net.java.dev.jna/jna/4.5.2</bundle>
 		<bundle dependency="true">mvn:net.java.dev.jna/jna-platform/4.5.2</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-transport-native-kqueue/4.1.42.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-handler-proxy/4.1.42.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-codec-socks/4.1.42.Final</bundle>
+		<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_2</bundle>
 		<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.tellstick/${project.version}</bundle>
 	</feature>
 </features>