diff --git a/pom.xml b/pom.xml index 468f209..1fe7d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ io.scalecube - scalecube-parent-pom - 0.2.19 + scalecube-parent + 0.2.20 scalecube-gateway-parent @@ -33,23 +33,25 @@ - 2.10.23 - 1.0.18 - 2.6.12 - - 2020.0.10 - 1.0.5 - 4.1.66.Final - 2.11.0 - 1.7.30 - 2.13.2 + 2.6.13 + 1.0.21 + 2.10.24 + + 2020.0.23 + 1.1.3 + 2.13.3 + 1.7.36 + 2.17.2 3.4.2 - 3.0.2 2.1.2 - 5.1.1 - 2.24.5 + + 4.6.1 + 5.8.2 1.3 + + https://maven.pkg.github.com/scalecube/scalecube-gateway + @@ -82,11 +84,6 @@ scalecube-services-transport-jackson ${scalecube-services.version} - - io.scalecube - scalecube-services-bytebuf-codec - ${scalecube-services.version} - io.scalecube scalecube-commons @@ -146,15 +143,6 @@ import - - - io.netty - netty-bom - ${netty.version} - pom - import - - org.jctools @@ -169,19 +157,19 @@ org.junit.jupiter junit-jupiter-engine - ${junit.version} + ${junit-jupiter.version} test org.junit.jupiter junit-jupiter-params - ${junit.version} + ${junit-jupiter.version} test org.mockito mockito-junit-jupiter - ${mockito.version} + ${mockito-junit-jupiter.version} test @@ -190,12 +178,6 @@ ${hamcrest.version} test - - org.hamcrest - hamcrest-core - ${hamcrest.version} - test - io.projectreactor reactor-test @@ -203,44 +185,4 @@ - - - deploy2Github - - - github - GitHub Packages - https://maven.pkg.github.com/scalecube/scalecube-gateway - - - - - deploy2Maven - - - ossrh - Central Repository OSSRH - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - maven-source-plugin - - - maven-javadoc-plugin - - - maven-gpg-plugin - - - - - - diff --git a/services-gateway-client-transport/pom.xml b/services-gateway-client-transport/pom.xml index f2ceaac..e1c92e9 100644 --- a/services-gateway-client-transport/pom.xml +++ b/services-gateway-client-transport/pom.xml @@ -11,10 +11,6 @@ scalecube-services-gateway-client-transport - - io.scalecube - scalecube-services-bytebuf-codec - io.scalecube scalecube-services-transport-rsocket @@ -24,10 +20,6 @@ scalecube-services - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - com.fasterxml.jackson.core jackson-core diff --git a/services-gateway-client-transport/src/main/java/io/scalecube/services/gateway/transport/websocket/WebsocketGatewayClientCodec.java b/services-gateway-client-transport/src/main/java/io/scalecube/services/gateway/transport/websocket/WebsocketGatewayClientCodec.java index 148bf9c..9dee6bc 100644 --- a/services-gateway-client-transport/src/main/java/io/scalecube/services/gateway/transport/websocket/WebsocketGatewayClientCodec.java +++ b/services-gateway-client-transport/src/main/java/io/scalecube/services/gateway/transport/websocket/WebsocketGatewayClientCodec.java @@ -13,7 +13,6 @@ import com.fasterxml.jackson.databind.MappingJsonFactory; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufInputStream; @@ -163,7 +162,6 @@ private static ObjectMapper objectMapper() { mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); - mapper.registerModule(new JavaTimeModule()); return mapper; } } diff --git a/services-gateway-netty/pom.xml b/services-gateway-netty/pom.xml index fcc4091..afec7d6 100644 --- a/services-gateway-netty/pom.xml +++ b/services-gateway-netty/pom.xml @@ -29,10 +29,6 @@ rsocket-transport-netty - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - com.fasterxml.jackson.core jackson-core diff --git a/services-gateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketServiceMessageCodec.java b/services-gateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketServiceMessageCodec.java index 48615a5..f3369df 100644 --- a/services-gateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketServiceMessageCodec.java +++ b/services-gateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketServiceMessageCodec.java @@ -13,7 +13,6 @@ import com.fasterxml.jackson.databind.MappingJsonFactory; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufInputStream; @@ -167,7 +166,6 @@ private static ObjectMapper objectMapper() { mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true); - mapper.registerModule(new JavaTimeModule()); return mapper; } }