Skip to content

Commit 93e8a80

Browse files
jknackjknack
committed
version bump for major components
- netty, utow, jetty & jackson - fix ssl issue after upgrading Jetty
1 parent 1fdc6c7 commit 93e8a80

File tree

7 files changed

+82
-13
lines changed

7 files changed

+82
-13
lines changed

‎doc/available-modules.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* [ehcache](https://github.com/jooby-project/jooby/tree/master/jooby-ehcache/#session-store): HTTP session store for {{ehcache}}.
2121

2222
## sql
23+
* [expose](https://github.com/jooby-project/jooby/tree/master/jooby-expose): [Exposed](https://github.com/JetBrains/Exposed) is a prototype for a lightweight SQL library written over JDBC driver for Kotlin language
2324
* [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc): high performance connection pool for jdbc via {{hikari}}.
2425
* [jdbi](https://github.com/jooby-project/jooby/tree/master/jooby-jdbi): fluent API for JDBC.
2526
* [flyway](https://github.com/jooby-project/jooby/tree/master/jooby-flyway): database migrations via {{flyway}}.

‎modules/coverage-report/pom.xml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,66 @@
707707
<alpn-boot.version>8.1.12.v20180117</alpn-boot.version>
708708
</properties>
709709
</profile>
710+
<profile>
711+
<id>jdk-1.8.0_181</id>
712+
<activation>
713+
<property>
714+
<name>java.version</name>
715+
<value>1.8.0_181</value>
716+
</property>
717+
</activation>
718+
<properties>
719+
<alpn-boot.version>8.1.12.v20180117</alpn-boot.version>
720+
</properties>
721+
</profile>
722+
<profile>
723+
<id>jdk-1.8.0_191</id>
724+
<activation>
725+
<property>
726+
<name>java.version</name>
727+
<value>1.8.0_191</value>
728+
</property>
729+
</activation>
730+
<properties>
731+
<alpn-boot.version>8.1.13.v20181017</alpn-boot.version>
732+
</properties>
733+
</profile>
734+
<profile>
735+
<id>jdk-1.8.0_192</id>
736+
<activation>
737+
<property>
738+
<name>java.version</name>
739+
<value>1.8.0_192</value>
740+
</property>
741+
</activation>
742+
<properties>
743+
<alpn-boot.version>8.1.13.v20181017</alpn-boot.version>
744+
</properties>
745+
</profile>
746+
<profile>
747+
<id>jdk-1.8.0_201</id>
748+
<activation>
749+
<property>
750+
<name>java.version</name>
751+
<value>1.8.0_201</value>
752+
</property>
753+
</activation>
754+
<properties>
755+
<alpn-boot.version>8.1.13.v20181017</alpn-boot.version>
756+
</properties>
757+
</profile>
758+
<profile>
759+
<id>jdk-1.8.0_202</id>
760+
<activation>
761+
<property>
762+
<name>java.version</name>
763+
<value>1.8.0_202</value>
764+
</property>
765+
</activation>
766+
<properties>
767+
<alpn-boot.version>8.1.13.v20181017</alpn-boot.version>
768+
</properties>
769+
</profile>
710770
</profiles>
711771

712772
<build>

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
import org.jooby.MediaType;
2727
import org.jooby.Results;
2828
import org.jooby.test.ServerFeature;
29+
2930
import static org.junit.Assert.assertEquals;
3031
import static org.junit.Assert.assertNotNull;
3132
import static org.junit.Assert.assertTrue;
33+
3234
import org.junit.Test;
3335

3436
import java.io.IOException;
@@ -45,6 +47,7 @@
4547
import java.util.concurrent.Phaser;
4648
import java.util.concurrent.TimeUnit;
4749
import java.util.concurrent.atomic.AtomicReference;
50+
import java.util.function.UnaryOperator;
4851

4952
public class Issue418 extends ServerFeature {
5053

@@ -224,15 +227,15 @@ public void http1_1_Upgrade() throws Throwable {
224227
}
225228
}
226229

227-
assertTrue(upgrade.toString().startsWith("HTTP/1.1 101 "));
230+
assertTrue(upgrade.toString(), upgrade.toString().startsWith("HTTP/1.1 101 "));
228231

229232
MappedByteBufferPool byteBufferPool = new MappedByteBufferPool();
230233
new Generator(byteBufferPool);
231234

232235
final AtomicReference<HeadersFrame> headersRef = new AtomicReference<>();
233236
final AtomicReference<DataFrame> dataRef = new AtomicReference<>();
234237
final AtomicReference<CountDownLatch> latchRef = new AtomicReference<>(new CountDownLatch(2));
235-
Parser parser = new Parser(byteBufferPool, new Parser.Listener.Adapter() {
238+
Parser.Listener.Adapter listener = new Parser.Listener.Adapter() {
236239
@Override
237240
public void onHeaders(final HeadersFrame frame) {
238241
headersRef.set(frame);
@@ -244,11 +247,14 @@ public void onData(final DataFrame frame) {
244247
dataRef.set(frame);
245248
latchRef.get().countDown();
246249
}
247-
}, 4096, 8192);
250+
};
251+
Parser parser = new Parser(byteBufferPool, listener, 4096, 8192);
252+
parser.init(UnaryOperator.identity());
248253

249254
parseResponse(client, parser);
250255

251256
assertTrue(latchRef.get().await(5, TimeUnit.SECONDS));
257+
// latchRef.get().await();
252258

253259
HeadersFrame response = headersRef.get();
254260
assertNotNull(response);

‎modules/jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ private ServerConnector https(final Server server, final Config conf, final Stri
341341
sslContextFactory.setSslContext(sslContext);
342342
sslContextFactory.setIncludeProtocols("TLSv1.2");
343343
sslContextFactory.setIncludeCipherSuites("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");
344+
sslContextFactory.setEndpointIdentificationAlgorithm("HTTPS");
344345

345346
HttpConfiguration httpsConf = new HttpConfiguration(httpConf);
346347
httpsConf.addCustomizer(new SecureRequestCustomizer());

‎modules/jooby-jetty/src/main/resources/org/jooby/spi/server.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ jetty {
3636
# The accept queue size (also known as accept backlog)
3737
AcceptQueueSize = 0
3838

39-
# Use -1 to disable
40-
SoLingerTime = -1
41-
4239
StopTimeout = 30000
4340

4441
# Sets the maximum Idle time for a connection, which roughly translates to the Socket#setSoTimeout(int)

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@
204204
package org.jooby.internal.undertow;
205205

206206
import java.io.IOException;
207+
import java.nio.channels.ClosedChannelException;
207208

209+
import org.jooby.internal.ConnectionResetByPeer;
208210
import org.jooby.spi.NativeResponse;
209211
import org.slf4j.Logger;
210212
import org.slf4j.LoggerFactory;
@@ -232,7 +234,9 @@ public void onComplete(final HttpServerExchange exchange, final Sender sender) {
232234
@Override
233235
public void onException(final HttpServerExchange exchange, final Sender sender,
234236
final IOException x) {
235-
log.error("execution of {} resulted in exception", exchange.getRequestPath(), x);
237+
if (!(x instanceof ClosedChannelException)) {
238+
log.error("execution of {} resulted in exception", exchange.getRequestPath(), x);
239+
}
236240
callback.onException(exchange, sender, x);
237241
}
238242

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3147,7 +3147,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
31473147
<avaje-agentloader.version>2.1.2</avaje-agentloader.version>
31483148
<aws-java-sdk.version>1.11.358</aws-java-sdk.version>
31493149
<bootstrap.version>3.3.4</bootstrap.version>
3150-
<boringssl.version>2.0.8.Final</boringssl.version>
3150+
<boringssl.version>2.0.20.Final</boringssl.version>
31513151
<bson4jackson.version>2.9.2</bson4jackson.version>
31523152
<caffeine.version>2.6.2</caffeine.version>
31533153
<camel.version>2.18.3</camel.version>
@@ -3186,7 +3186,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
31863186
<hikariCP.version>3.2.0</hikariCP.version>
31873187
<http-client.version>4.5.5</http-client.version>
31883188
<j2v8.version>4.6.0</j2v8.version>
3189-
<jackson.version>2.9.7</jackson.version>
3189+
<jackson.version>2.9.8</jackson.version>
31903190
<jade4j.version>1.2.7</jade4j.version>
31913191
<javassist.version>3.22.0-GA</javassist.version>
31923192
<javax.el-api.version>3.0.1-b06</javax.el-api.version>
@@ -3199,7 +3199,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
31993199
<jdbi3.version>3.3.0</jdbi3.version>
32003200
<jedis.version>2.9.0</jedis.version>
32013201
<jersey-client.version>1.19.4</jersey-client.version>
3202-
<jetty.version>9.4.10.v20180503</jetty.version>
3202+
<jetty.version>9.4.14.v20181114</jetty.version>
32033203
<jongo.version>1.4.0</jongo.version>
32043204
<jquery-ui.version>1.11.3</jquery-ui.version>
32053205
<jquery.version>2.1.3</jquery.version>
@@ -3222,7 +3222,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
32223222
<neo4j.expire.version>3.4.0.52.4</neo4j.expire.version>
32233223
<neo4j.runtime.version>3.4.0.52</neo4j.runtime.version>
32243224
<neo4j.version>3.3.2</neo4j.version>
3225-
<netty.version>4.1.30.Final</netty.version>
3225+
<netty.version>4.1.33.Final</netty.version>
32263226
<pac4j.version>1.9.9</pac4j.version>
32273227
<pac4j2.version>2.3.1</pac4j2.version>
32283228
<pebble.version>2.4.0</pebble.version>
@@ -3248,10 +3248,10 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
32483248
<swagger-ui.version>3.17.1</swagger-ui.version>
32493249
<swagger.version>1.5.20</swagger.version>
32503250
<thymeleaf.version>3.0.10.RELEASE</thymeleaf.version>
3251-
<undertow.version>2.0.9.Final</undertow.version>
3251+
<undertow.version>2.0.17.Final</undertow.version>
32523252
<xmlgraphics-commons.version>2.1</xmlgraphics-commons.version>
32533253
<yuicompressor.version>2.4.8</yuicompressor.version>
3254-
<exposed.version>0.10.4</exposed.version>
3254+
<exposed.version>0.12.1</exposed.version>
32553255

32563256
<!-- config -->
32573257
<ebean.agent.packages>**</ebean.agent.packages>

0 commit comments

Comments
 (0)