From 2b505d5176870df32ad3e752ea7dd8b1927d585c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Fri, 17 Aug 2018 11:46:18 +0200
Subject: [PATCH] update to Netty 4.1.28, Gradle 4.9

---
 build.gradle                                  |  16 ++++++++++++----
 gradle.properties                             |  10 ++++++----
 gradle/wrapper/gradle-wrapper.jar             | Bin 54417 -> 54413 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 .../http/server/context/ContextHandler.java   |   3 +--
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1ad4fc1..acd5310 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,7 @@ printf "Date: %s\nHost: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGradle: %s Groovy: %
         System.getProperty("java.vm.name"),
         gradle.gradleVersion, GroovySystem.getVersion(), JavaVersion.current()
 
+apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 apply plugin: "io.codearte.nexus-staging"
 
 subprojects {
@@ -28,7 +29,6 @@ subprojects {
     apply plugin: 'maven'
     apply plugin: 'signing'
     apply plugin: "com.github.spotbugs"
-    apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
 
     configurations {
         alpnagent
@@ -42,8 +42,15 @@ subprojects {
         wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
     }
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    compileJava {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    compileTestJava {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
     tasks.withType(JavaCompile) {
@@ -61,7 +68,8 @@ subprojects {
             jvmArgs "-javaagent:" + configurations.alpnagent.asPath
         }
         testLogging {
-            showStandardStreams = true
+            // set this to 'true' to show lot of debug output
+            showStandardStreams = false
             exceptionFormat = 'full'
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 7e607e7..6a6794b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,15 @@
 group = org.xbib
-name = netty-http-client
-version = 4.1.27.0
+name = netty-http
+version = 4.1.28.0
 
-netty.version = 4.1.27.Final
+netty.version = 4.1.28.Final
 tcnative.version = 2.0.7.Final
+bouncycastle.version = 1.60
 conscrypt.version = 1.0.1
-bouncycastle.version = 1.57
 xbib-net-url.version = 1.1.1
 alpnagent.version = 2.0.7
+
+# test
 junit.version = 4.12
 jackson.version = 2.8.11.1
 wagon.version = 3.0.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec7947253b058ff79c88ce51f3abe08a..0d4a9516871afd710a9d84d89e31ba77745607bd 100644
GIT binary patch
delta 732
zcmYk4Ur19?9LINl)~4m3n;~1*r8tRj;+ldsTG*&j;mD0LiLwYROK2iKWQ|?~A0o3h
zzap4_7J?6pUPQ=BD%&6DHm6Q~$R4bh2%#5!>&Z@s+uDW0{d~^%+{^czdwqed{y>)Z
zc+T&yL!MJAm8!{SYf|rYZFe!1SDt!vF<7`q<#K4UACy<N9_0A}J_f>iSVEQmpTWJ*
zCH4Yyp=$OKJ0T0(LXSg>)8PuzGk9Y~a55RAVIwuGg?b~|_z|w56PmQvMb6Mjj-nRY
z(x#K25gTpjgx1eD(Bo2p{&_ncGbpGYh+64zl`vOT0mdT|v?eK+msKu}NrWG2H3&p&
z=t-@jdDx8_DRo|`ZJ~~CIRy4EIH}`;f_VcmGv8lz>^k${dF(1Rx9~&{Z%aNJQWB2D
zW!4H?+{J?M#ZR(rEX8loqq`_*JA`wIMk;e7)u+cbw-)h)k!CuCwj@e%v@^4%wo?S{
zi*>97FBdP<zHUBIj_;nmaCH}9Hz~oMl*#W=rVF86l`xr<*&ybU?ewKb1dU5hde|%Q
zeXkyyOGcXR<64hbyzZ4{nWmnJbaPmZv1J=g`qKK#Cy7lZ1~Z$@4yG5lSFH4QNYPwu
zte9zRSg0v=mhO)V98Os&IW92YU&0$mD4xiC;r<C88gP5nOk30VHfz8;j-O{an)o3}
ss92L(6!x_{Yy_{@+NdLlr@=DRu1m$4Kcnv77Z&$VxVc`b)`kAcA3t>?lmGw#

delta 674
zcmYk)T}V@590u^ce`_BwX^}IxS%%_;lVr<EjY%_8!l6cqDF{ZiDO5BKTAzy0m1(&i
z69i4_rlboA^P*O%oo(*>!`V#{7~K>D!@P~?^<`NH4(Ing@BclV!#Ts#S?=kqkqXuP
zh4b|_GMTK^ZEaC})BWsS?`2rD8(zFT^*$$2zD;)0rchoVsqNJAp<VohTgt~lsr27Y
zbW5k%1l~wywtzLMlBLlj&qcM@NP8K+__gTs9;Y_BU__<FeYq0f`Km>+Rb5f&VDlMi
zQYES(UnQk?Z>@gyS?N=rh)4VlG+4lCz<faty22Xx{CZ}_s{afX>=!dlOI4&Q6MV!u
zbVzV*se)1`1TBHX<gf`&HD+ThaEzRdBK`<e(?pA4xMdH{290#9UBu_@dU$wj>k#o*
z@F>~s=(iW+T*%107!Fxz!;Wl6Iev$X)Yr|aLv6T;iY{T%osXGt4SR+4a4YGYqG)!i
z`5iSFi0EnGRbCZgAz~)AORzt>9ZfDROi?2}zLBXcG<I8XHCjg>2Lu~p&2;mQ;Ja8o
z&D|9&iPzEWJ<bx0$F20#%~^%ZF%5#F8a4lpnd9x~=FEeKJ24a2U@)Pl*JEOrDJjQ?
zgo&ocGttVfp(okN;z%YhQuY&G7h=Pg3)ixq(zE#NDa72ei6jqanRv6}l%54)O?9zJ
eJWDy46FXK882<m8^8P-DxGth&rBt3TZH7P2bsJXz

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a87f84..b67edd5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 12 11:53:13 CEST 2018
+#Fri Aug 17 10:24:58 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/netty-http-server/src/main/java/org/xbib/netty/http/server/context/ContextHandler.java b/netty-http-server/src/main/java/org/xbib/netty/http/server/context/ContextHandler.java
index 7e2464c..3d43396 100644
--- a/netty-http-server/src/main/java/org/xbib/netty/http/server/context/ContextHandler.java
+++ b/netty-http-server/src/main/java/org/xbib/netty/http/server/context/ContextHandler.java
@@ -6,8 +6,7 @@ import org.xbib.netty.http.server.transport.ServerResponse;
 import java.io.IOException;
 
 /**
- * A {@code ContextHandler} is capable of serving content for
- * resources within its context.
+ * A {@code ContextHandler} is capable of serving content for resources within its context.
  *
  * @see VirtualServer#addContext
  */