From ac22d2153a09376bc283c0dabdd07098ec425d41 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 21 Apr 2022 14:51:21 +0200 Subject: [PATCH 1/2] Update vertx-server module Adapt it to parent POM changes. Depends on https://github.com/artipie/ppom/pull/103 --- pom.xml | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 1576111..5d2f3e3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,30 @@ SOFTWARE. --> 4.0.0 + com.artipie ppom - 1.0.4 + 2.0-SNAPSHOT + + vertx-server 1.0-SNAPSHOT - jar - The Vert.x server - A Vert.x which can serve artipie slices + + ${project.groupId}:${project.artifactId} + A Vert.x which can serve Artipie Slices https://github.com/artipie/vertx-server + 2020 + MIT https://github.com/artipie/vertx-server/blob/master/LICENSE - - UTF-8 - + 1 @@ -59,52 +62,61 @@ SOFTWARE. +1 + GitHub https://github.com/artipie/vertx-server/issues + scm:git:git@github.com:artipie/vertx-server.git scm:git:git@github.com:artipie/vertx-server.git https://github.com/artipie/vertx-server + rultor https://www.rultor.com/s/vertx-server + github-pages https://github.com/artipie/vertx-server + + + ${project.basedir}/LICENSE.txt + 17 + + com.artipie http 0.16.2 + io.vertx vertx-rx-java2 + com.jcabi jcabi-log + + org.junit.jupiter junit-jupiter-api + test - - org.junit.jupiter - junit-jupiter-engine - - org.slf4j slf4j-simple - 1.7.21 test @@ -115,7 +127,6 @@ SOFTWARE. org.hamcrest hamcrest - 2.2 test From dcc6d3e6761f90aa920a27fba98b062acecef524 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 21 Apr 2022 14:58:29 +0200 Subject: [PATCH 2/2] Remove single liner dep on netty, remove fluff --- pom.xml | 9 ++++++--- .../java/com/artipie/vertx/VertxSliceServerTest.java | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 5d2f3e3..2663fc4 100644 --- a/pom.xml +++ b/pom.xml @@ -98,14 +98,17 @@ SOFTWARE. 0.16.2 + + io.vertx + vertx-core + io.vertx vertx-rx-java2 - - com.jcabi - jcabi-log + org.reactivestreams + reactive-streams diff --git a/src/test/java/com/artipie/vertx/VertxSliceServerTest.java b/src/test/java/com/artipie/vertx/VertxSliceServerTest.java index a98ff38..c1fcd35 100644 --- a/src/test/java/com/artipie/vertx/VertxSliceServerTest.java +++ b/src/test/java/com/artipie/vertx/VertxSliceServerTest.java @@ -26,7 +26,6 @@ import com.artipie.http.Headers; import com.artipie.http.Slice; import com.artipie.http.rs.RsStatus; -import io.netty.handler.codec.http.HttpHeaderNames; import io.reactivex.Flowable; import io.vertx.core.http.HttpServerOptions; import io.vertx.reactivex.core.Vertx; @@ -166,7 +165,7 @@ public void basicGetRequestWithContentLengthHeader() { MatcherAssert.assertThat(actual, Matchers.equalTo(expected)); MatcherAssert.assertThat(response.getHeader(clh), Matchers.notNullValue()); MatcherAssert.assertThat( - response.getHeader(String.valueOf(HttpHeaderNames.TRANSFER_ENCODING)), + response.getHeader(String.valueOf("Transfer-Encoding")), Matchers.nullValue() ); }