From aa82f681e342ef9d0c9b3136f8ba33e74901a741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Tue, 16 Jun 2020 11:11:45 +0200
Subject: [PATCH] fix netty proxy handler dependency, update to xbib net 2.1.0

---
 gradle.properties                                    | 6 +++---
 netty-http-client-api/src/main/java/module-info.java | 1 -
 netty-http-client/build.gradle                       | 2 +-
 netty-http-client/src/main/java/module-info.java     | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 25855fc..d3048fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 group = org.xbib
 name = netty-http
-version = 4.1.50.0
+version = 4.1.50.1
 
 gradle.wrapper.version = 6.4.1
 netty.version = 4.1.50.Final
 tcnative.version = 2.0.29.Final
 tcnative-legacy-macosx.version = 2.0.26.Final
-xbib.net.version = 2.0.4
+xbib.net.version = 2.1.0
 bouncycastle.version = 1.64
 reactivestreams.version = 1.0.2
 xbib-guice.version = 4.0.4
@@ -15,6 +15,6 @@ conscrypt.version = 2.2.1
 jackson.version = 2.11.0
 mockito.version = 3.3.3
 asciidoclet.version = 1.5.6
-# uuhh, too many tests to update in rx
+# uuhh, too many tests to update to jupiter in rx...
 junit.version = 5.6.2
 junit4.version = 4.13
diff --git a/netty-http-client-api/src/main/java/module-info.java b/netty-http-client-api/src/main/java/module-info.java
index 4c0486c..7a28043 100644
--- a/netty-http-client-api/src/main/java/module-info.java
+++ b/netty-http-client-api/src/main/java/module-info.java
@@ -1,7 +1,6 @@
 module org.xbib.netty.http.client.api {
     exports org.xbib.netty.http.client.api;
     requires transitive org.xbib.netty.http.common;
-    requires org.xbib.net.url;
     requires io.netty.buffer;
     requires io.netty.common;
     requires io.netty.codec.http;
diff --git a/netty-http-client/build.gradle b/netty-http-client/build.gradle
index 5a38513..92c4019 100644
--- a/netty-http-client/build.gradle
+++ b/netty-http-client/build.gradle
@@ -2,7 +2,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 dependencies {
     api project(":netty-http-client-api")
-    implementation "io.netty:netty-handler-proxy:${project.property('netty.version')}"
+    api "io.netty:netty-handler-proxy:${project.property('netty.version')}"
     testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
     testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}"
     testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}"
diff --git a/netty-http-client/src/main/java/module-info.java b/netty-http-client/src/main/java/module-info.java
index 784326e..1154c04 100644
--- a/netty-http-client/src/main/java/module-info.java
+++ b/netty-http-client/src/main/java/module-info.java
@@ -7,7 +7,6 @@ module org.xbib.netty.http.client {
     exports org.xbib.netty.http.client.retry;
     exports org.xbib.netty.http.client.transport;
     requires transitive org.xbib.netty.http.client.api;
-    requires org.xbib.net.url;
     requires io.netty.buffer;
     requires io.netty.common;
     requires io.netty.codec.http;