Skip to content

Commit 59a92fb

Browse files
jknackjknack
committed
Version bump
netty 4.1.25 fix #1062 hikari 3.2.0 fix #1108 jboss-modules 1.8.5 fix #1109 utow 1.4.25 fix #1063 jetty 9.4.10 fix #1064 freemarker 2.3.28 fix #1110 ebean 11.16.1 fix #1112 jdbi 3.2.1 fix #1111
1 parent 1397663 commit 59a92fb

File tree

5 files changed

+46
-37
lines changed

5 files changed

+46
-37
lines changed

‎modules/coverage-report/src/test/java/org/jooby/BufferSizeFeature.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.jooby;
22

3-
import java.io.ByteArrayInputStream;
4-
import java.util.Optional;
5-
6-
import org.jooby.test.ServerFeature;
7-
import org.junit.Test;
8-
93
import com.google.common.base.Charsets;
104
import com.typesafe.config.ConfigFactory;
115
import com.typesafe.config.ConfigValueFactory;
6+
import org.jooby.test.OnServer;
7+
import org.jooby.test.ServerFeature;
8+
import org.jooby.undertow.Undertow;
9+
import org.junit.Test;
10+
11+
import java.io.ByteArrayInputStream;
12+
import java.util.Optional;
1213

1314
public class BufferSizeFeature extends ServerFeature {
1415

‎modules/jooby-apitool/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<plugin>
5050
<groupId>org.antlr</groupId>
5151
<artifactId>antlr4-maven-plugin</artifactId>
52-
<version>4.7</version>
52+
<version>4.7.1</version>
5353
<configuration>
5454
<libDirectory>src/main/antlr4</libDirectory>
5555
<outputDirectory>src/main/java</outputDirectory>

‎modules/jooby-run/src/main/java/org/jooby/run/Main.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@
203203
*/
204204
package org.jooby.run;
205205

206+
import org.jboss.modules.Module;
207+
import org.jboss.modules.ModuleClassLoader;
208+
import org.jboss.modules.ModuleIdentifier;
209+
import org.jboss.modules.ModuleLoader;
210+
import org.jboss.modules.log.ModuleLogger;
211+
206212
import java.io.File;
207213
import java.io.FileInputStream;
208214
import java.io.IOException;
@@ -212,6 +218,7 @@
212218
import java.lang.reflect.Field;
213219
import java.lang.reflect.InvocationTargetException;
214220
import java.lang.reflect.Method;
221+
import java.net.URL;
215222
import java.nio.file.FileSystems;
216223
import java.nio.file.Files;
217224
import java.nio.file.Path;
@@ -233,12 +240,6 @@
233240
import java.util.concurrent.atomic.AtomicReference;
234241
import java.util.stream.LongStream;
235242

236-
import org.jboss.modules.Module;
237-
import org.jboss.modules.ModuleClassLoader;
238-
import org.jboss.modules.ModuleIdentifier;
239-
import org.jboss.modules.ModuleLoader;
240-
import org.jboss.modules.log.ModuleLogger;
241-
242243
public class Main {
243244

244245
static final String JOOBY_REF = "org.jooby.internal.run__.JoobyRef";
@@ -640,6 +641,12 @@ public void classDefined(final String name, final Module module) {
640641
public void classDefineFailed(final Throwable throwable, final String className,
641642
final Module module) {
642643
}
644+
645+
@Override public void jaxpClassLoaded(Class<?> aClass, Module module) {
646+
}
647+
648+
@Override public void jaxpResourceLoaded(URL url, Module module) {
649+
}
643650
});
644651
}
645652

‎modules/jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowResponse.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,18 @@
203203
*/
204204
package org.jooby.internal.undertow;
205205

206+
import com.google.common.collect.ImmutableList;
207+
import io.undertow.Handlers;
208+
import io.undertow.io.IoCallback;
209+
import io.undertow.server.HttpServerExchange;
210+
import io.undertow.util.HeaderMap;
211+
import io.undertow.util.HeaderValues;
212+
import io.undertow.util.Headers;
213+
import io.undertow.util.HttpString;
206214
import static java.util.Objects.requireNonNull;
215+
import org.jooby.spi.NativeResponse;
216+
import org.jooby.spi.NativeWebSocket;
217+
import org.slf4j.LoggerFactory;
207218

208219
import java.io.InputStream;
209220
import java.nio.ByteBuffer;
@@ -213,19 +224,6 @@
213224
import java.util.List;
214225
import java.util.Optional;
215226

216-
import org.jooby.spi.NativeResponse;
217-
import org.jooby.spi.NativeWebSocket;
218-
import org.slf4j.LoggerFactory;
219-
220-
import com.google.common.collect.ImmutableList;
221-
222-
import io.undertow.Handlers;
223-
import io.undertow.io.IoCallback;
224-
import io.undertow.server.HttpServerExchange;
225-
import io.undertow.util.HeaderMap;
226-
import io.undertow.util.HeaderValues;
227-
import io.undertow.util.HttpString;
228-
229227
public class UndertowResponse implements NativeResponse {
230228

231229
private HttpServerExchange exchange;
@@ -251,6 +249,9 @@ public Optional<String> header(final String name) {
251249

252250
@Override
253251
public void header(final String name, final String value) {
252+
if ("Content-Length".equalsIgnoreCase(name)) {
253+
exchange.getResponseHeaders().remove(Headers.TRANSFER_ENCODING);
254+
}
254255
exchange.getResponseHeaders().put(HttpString.tryFromString(name), value);
255256
}
256257

‎pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2978,10 +2978,10 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
29782978
<!-- Dependencies -->
29792979
<funzy.version>0.1.0</funzy.version>
29802980
<jackson.version>2.9.5</jackson.version>
2981-
<undertow.version>1.4.23.Final</undertow.version>
2981+
<undertow.version>1.4.25.Final</undertow.version>
29822982
<servlet.version>3.1.0</servlet.version>
2983-
<jetty.version>9.4.9.v20180320</jetty.version>
2984-
<netty.version>4.1.24.Final</netty.version>
2983+
<jetty.version>9.4.10.v20180503</jetty.version>
2984+
<netty.version>4.1.25.Final</netty.version>
29852985
<boringssl.version>2.0.8.Final</boringssl.version>
29862986
<javassist.version>3.22.0-GA</javassist.version>
29872987
<javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
@@ -2991,11 +2991,11 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
29912991
<guava.version>21.0</guava.version>
29922992
<guice.version>4.1.0</guice.version>
29932993
<config.version>1.3.2</config.version>
2994-
<handlebars.version>4.0.6</handlebars.version>
2994+
<handlebars.version>4.0.7</handlebars.version>
29952995
<h2.version>1.4.196</h2.version>
29962996
<mysql-connector-java.version>5.1.42</mysql-connector-java.version>
29972997
<pgjdbc-ng.version>0.7.1</pgjdbc-ng.version>
2998-
<hikariCP.version>2.7.7</hikariCP.version>
2998+
<hikariCP.version>3.2.0</hikariCP.version>
29992999
<hibernate.version>5.2.1.Final</hibernate.version>
30003000
<jsr305.version>3.0.2</jsr305.version>
30013001
<http-client.version>4.5.2</http-client.version>
@@ -3005,15 +3005,15 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
30053005
<asm.version>6.1.1</asm.version>
30063006
<quartz.version>2.2.2</quartz.version>
30073007
<jdbi.version>2.78</jdbi.version>
3008-
<jdbi3.version>3.0.1</jdbi3.version>
3009-
<freemarker.version>2.3.26-incubating</freemarker.version>
3008+
<jdbi3.version>3.2.1</jdbi3.version>
3009+
<freemarker.version>2.3.28</freemarker.version>
30103010
<camel.version>2.18.3</camel.version>
30113011
<jedis.version>2.9.0</jedis.version>
30123012
<mongo-driver-core.version>3.2.2</mongo-driver-core.version>
30133013
<mongo-java-driver.version>3.2.2</mongo-java-driver.version>
30143014
<mongodb-driver-async.version>${mongo-java-driver.version}</mongodb-driver-async.version>
30153015
<morphia.version>1.1.1</morphia.version>
3016-
<jboss-modules.version>1.7.0.Beta3</jboss-modules.version>
3016+
<jboss-modules.version>1.8.5.Final</jboss-modules.version>
30173017
<elasticsearch>5.5.3</elasticsearch>
30183018
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
30193019
<javax.el-api.version>2.2.5</javax.el-api.version>
@@ -3036,10 +3036,10 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
30363036
<flyway.version>5.0.7</flyway.version>
30373037
<hazelcast.version>3.9.2</hazelcast.version>
30383038
<less4j.version>1.13.0</less4j.version>
3039-
<ebean.version>10.1.7</ebean.version>
3039+
<ebean.version>11.16.1</ebean.version>
30403040
<avaje-agentloader.version>2.1.2</avaje-agentloader.version>
3041-
<ebean-agent.version>10.1.7</ebean-agent.version>
3042-
<ebean-maven-plugin.version>10.1.7</ebean-maven-plugin.version>
3041+
<ebean-agent.version>11.11.1</ebean-agent.version>
3042+
<ebean-maven-plugin.version>11.11.2</ebean-maven-plugin.version>
30433043
<akka.version>2.5.9</akka.version>
30443044
<yuicompressor.version>2.4.8</yuicompressor.version>
30453045
<closure-compiler.version>v20180204</closure-compiler.version>

0 commit comments

Comments
 (0)