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

update to Netty 4.1.28, Gradle 4.9

Browse source
This commit is contained in:
Jörg Prante 2018-08-17 11:46:18 +02:00
parent 3cc30c4f1d
commit 2b505d5176
5 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -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"), System.getProperty("java.vm.name"),
gradle.gradleVersion, GroovySystem.getVersion(), JavaVersion.current() gradle.gradleVersion, GroovySystem.getVersion(), JavaVersion.current()
apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
apply plugin: "io.codearte.nexus-staging" apply plugin: "io.codearte.nexus-staging"
subprojects { subprojects {
@ -28,7 +29,6 @@ subprojects {
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'signing' apply plugin: 'signing'
apply plugin: "com.github.spotbugs" apply plugin: "com.github.spotbugs"
apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
configurations { configurations {
alpnagent alpnagent
@ -42,8 +42,15 @@ subprojects {
wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}"
} }
compileJava {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = 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' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
@ -61,7 +68,8 @@ subprojects {
jvmArgs "-javaagent:" + configurations.alpnagent.asPath jvmArgs "-javaagent:" + configurations.alpnagent.asPath
} }
testLogging { testLogging {
showStandardStreams = true // set this to 'true' to show lot of debug output
showStandardStreams = false
exceptionFormat = 'full' exceptionFormat = 'full'
} }
} }

10
gradle.properties
View file

@ -1,13 +1,15 @@
group = org.xbib group = org.xbib
name = netty-http-client name = netty-http
version = 4.1.27.0 version = 4.1.28.0
netty.version = 4.1.27.Final netty.version = 4.1.28.Final
tcnative.version = 2.0.7.Final tcnative.version = 2.0.7.Final
bouncycastle.version = 1.60
conscrypt.version = 1.0.1 conscrypt.version = 1.0.1
bouncycastle.version = 1.57
xbib-net-url.version = 1.1.1 xbib-net-url.version = 1.1.1
alpnagent.version = 2.0.7 alpnagent.version = 2.0.7
# test
junit.version = 4.12 junit.version = 4.12
jackson.version = 2.8.11.1 jackson.version = 2.8.11.1
wagon.version = 3.0.0 wagon.version = 3.0.0

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 @@
#Thu Jul 12 11:53:13 CEST 2018 #Fri Aug 17 10:24:58 CEST 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.8.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

3
netty-http-server/src/main/java/org/xbib/netty/http/server/context/ContextHandler.java
View file

@ -6,8 +6,7 @@ import org.xbib.netty.http.server.transport.ServerResponse;
import java.io.IOException; import java.io.IOException;
/** /**
* A {@code ContextHandler} is capable of serving content for * A {@code ContextHandler} is capable of serving content for resources within its context.
* resources within its context.
* *
* @see VirtualServer#addContext * @see VirtualServer#addContext
*/ */