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 758de96..0d4a951 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ 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 */