joerg/netty-http
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to netty 4.1.30, tcnative 2.0.19, alpnagent 2.0.9, gradle 4.10.2

Browse source
This commit is contained in:
Jörg Prante 2018-11-13 14:11:37 +01:00
parent 7b3d9cd366
commit b024cb26e6
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -2,7 +2,7 @@ import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
plugins { plugins {
id "com.github.spotbugs" version "1.6.2" id "com.github.spotbugs" version "1.6.5"
id "org.sonarqube" version "2.6.1" id "org.sonarqube" version "2.6.1"
id "io.codearte.nexus-staging" version "0.11.0" id "io.codearte.nexus-staging" version "0.11.0"
id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1" id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1"

14
gradle.properties
View file

@ -1,16 +1,16 @@
group = org.xbib group = org.xbib
name = netty-http name = netty-http
version = 4.1.28.0 version = 4.1.30.0
netty.version = 4.1.28.Final netty.version = 4.1.30.Final
tcnative.version = 2.0.7.Final tcnative.version = 2.0.19.Final
bouncycastle.version = 1.60 bouncycastle.version = 1.60
conscrypt.version = 1.0.1 xbib-net-url.version = 1.1.3
xbib-net-url.version = 1.1.1 alpnagent.version = 2.0.9
alpnagent.version = 2.0.7
# test # tests /docs
junit.version = 4.12 junit.version = 4.12
conscrypt.version = 1.0.1
jackson.version = 2.8.11.1 jackson.version = 2.8.11.1
wagon.version = 3.0.0 wagon.version = 3.0.0
asciidoclet.version = 1.5.4 asciidoclet.version = 1.5.4

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Aug 17 10:24:58 CEST 2018 #Tue Nov 13 10:38:26 CET 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

1
netty-http-client/build.gradle
View file

@ -3,6 +3,7 @@ dependencies {
compile project(":netty-http-common") compile project(":netty-http-common")
compile "io.netty:netty-handler-proxy:${project.property('netty.version')}" compile "io.netty:netty-handler-proxy:${project.property('netty.version')}"
compile "io.netty:netty-transport-native-epoll:${project.property('netty.version')}" compile "io.netty:netty-transport-native-epoll:${project.property('netty.version')}"
testCompile "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" testCompile "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
testCompile "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}" testCompile "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}"
testCompile "junit:junit:${project.property('junit.version')}" testCompile "junit:junit:${project.property('junit.version')}"

5
netty-http-client/src/main/java/org/xbib/netty/http/client/RequestBuilder.java
View file

@ -20,8 +20,11 @@ import org.xbib.net.URLSyntaxException;
import org.xbib.netty.http.client.retry.BackOff; import org.xbib.netty.http.client.retry.BackOff;
import org.xbib.netty.http.common.HttpAddress; import org.xbib.netty.http.common.HttpAddress;
import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.nio.charset.MalformedInputException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.charset.UnmappableCharacterException;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -277,7 +280,7 @@ public class RequestBuilder {
if (uri != null) { if (uri != null) {
try { try {
url = URL.base(url).resolve(uri); url = URL.base(url).resolve(uri);
} catch (URLSyntaxException e) { } catch (URLSyntaxException | MalformedInputException | UnmappableCharacterException e) {
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} }
} }

1
netty-http-server/build.gradle
View file

@ -4,6 +4,7 @@ dependencies {
compile "io.netty:netty-transport-native-epoll:${project.property('netty.version')}" compile "io.netty:netty-transport-native-epoll:${project.property('netty.version')}"
compile "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" compile "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
compile "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}" compile "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}"
testCompile project(":netty-http-client") testCompile project(":netty-http-client")
testCompile "junit:junit:${project.property('junit.version')}" testCompile "junit:junit:${project.property('junit.version')}"
} }