Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit f0cde2f

Browse files
artem-vartem-v
authored
Updated parent (#194)
1 parent 0f5401b commit f0cde2f

File tree

5 files changed

+20
-94
lines changed

5 files changed

+20
-94
lines changed

‎pom.xml‎

Lines changed: 20 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<parent>
66
<groupId>io.scalecube</groupId>
7-
<artifactId>scalecube-parent-pom</artifactId>
8-
<version>0.2.19</version>
7+
<artifactId>scalecube-parent</artifactId>
8+
<version>0.2.20</version>
99
</parent>
1010

1111
<artifactId>scalecube-gateway-parent</artifactId>
@@ -33,23 +33,25 @@
3333
</scm>
3434

3535
<properties>
36-
<scalecube-services.version>2.10.23</scalecube-services.version>
37-
<scalecube-commons.version>1.0.18</scalecube-commons.version>
38-
<scalecube-cluster.version>2.6.12</scalecube-cluster.version>
39-
40-
<reactor.version>2020.0.10</reactor.version>
41-
<rsocket.version>1.0.5</rsocket.version>
42-
<netty.version>4.1.66.Final</netty.version>
43-
<jackson.version>2.11.0</jackson.version>
44-
<slf4j.version>1.7.30</slf4j.version>
45-
<log4j.version>2.13.2</log4j.version>
36+
<scalecube-cluster.version>2.6.13</scalecube-cluster.version>
37+
<scalecube-commons.version>1.0.21</scalecube-commons.version>
38+
<scalecube-services.version>2.10.24</scalecube-services.version>
39+
40+
<reactor.version>2020.0.23</reactor.version>
41+
<rsocket.version>1.1.3</rsocket.version>
42+
<jackson.version>2.13.3</jackson.version>
43+
<slf4j.version>1.7.36</slf4j.version>
44+
<log4j.version>2.17.2</log4j.version>
4645
<disruptor.version>3.4.2</disruptor.version>
47-
4846
<jsr305.version>3.0.2</jsr305.version>
4947
<jctools.version>2.1.2</jctools.version>
50-
<junit.version>5.1.1</junit.version>
51-
<mockito.version>2.24.5</mockito.version>
48+
49+
<mockito-junit-jupiter.version>4.6.1</mockito-junit-jupiter.version>
50+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
5251
<hamcrest.version>1.3</hamcrest.version>
52+
53+
<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-gateway
54+
</distributionManagement.url>
5355
</properties>
5456

5557
<modules>
@@ -82,11 +84,6 @@
8284
<artifactId>scalecube-services-transport-jackson</artifactId>
8385
<version>${scalecube-services.version}</version>
8486
</dependency>
85-
<dependency>
86-
<groupId>io.scalecube</groupId>
87-
<artifactId>scalecube-services-bytebuf-codec</artifactId>
88-
<version>${scalecube-services.version}</version>
89-
</dependency>
9087
<dependency>
9188
<groupId>io.scalecube</groupId>
9289
<artifactId>scalecube-commons</artifactId>
@@ -146,15 +143,6 @@
146143
<scope>import</scope>
147144
</dependency>
148145

149-
<!-- Netty -->
150-
<dependency>
151-
<groupId>io.netty</groupId>
152-
<artifactId>netty-bom</artifactId>
153-
<version>${netty.version}</version>
154-
<type>pom</type>
155-
<scope>import</scope>
156-
</dependency>
157-
158146
<!-- JCTools -->
159147
<dependency>
160148
<groupId>org.jctools</groupId>
@@ -169,19 +157,19 @@
169157
<dependency>
170158
<groupId>org.junit.jupiter</groupId>
171159
<artifactId>junit-jupiter-engine</artifactId>
172-
<version>${junit.version}</version>
160+
<version>${junit-jupiter.version}</version>
173161
<scope>test</scope>
174162
</dependency>
175163
<dependency>
176164
<groupId>org.junit.jupiter</groupId>
177165
<artifactId>junit-jupiter-params</artifactId>
178-
<version>${junit.version}</version>
166+
<version>${junit-jupiter.version}</version>
179167
<scope>test</scope>
180168
</dependency>
181169
<dependency>
182170
<groupId>org.mockito</groupId>
183171
<artifactId>mockito-junit-jupiter</artifactId>
184-
<version>${mockito.version}</version>
172+
<version>${mockito-junit-jupiter.version}</version>
185173
<scope>test</scope>
186174
</dependency>
187175
<dependency>
@@ -190,57 +178,11 @@
190178
<version>${hamcrest.version}</version>
191179
<scope>test</scope>
192180
</dependency>
193-
<dependency>
194-
<groupId>org.hamcrest</groupId>
195-
<artifactId>hamcrest-core</artifactId>
196-
<version>${hamcrest.version}</version>
197-
<scope>test</scope>
198-
</dependency>
199181
<dependency>
200182
<groupId>io.projectreactor</groupId>
201183
<artifactId>reactor-test</artifactId>
202184
<scope>test</scope>
203185
</dependency>
204186
</dependencies>
205187

206-
<profiles>
207-
<profile>
208-
<id>deploy2Github</id>
209-
<distributionManagement>
210-
<repository>
211-
<id>github</id>
212-
<name>GitHub Packages</name>
213-
<url>https://maven.pkg.github.com/scalecube/scalecube-gateway</url>
214-
</repository>
215-
</distributionManagement>
216-
</profile>
217-
<profile>
218-
<id>deploy2Maven</id>
219-
<distributionManagement>
220-
<repository>
221-
<id>ossrh</id>
222-
<name>Central Repository OSSRH</name>
223-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
224-
</repository>
225-
</distributionManagement>
226-
<build>
227-
<plugins>
228-
<plugin>
229-
<groupId>org.sonatype.plugins</groupId>
230-
<artifactId>nexus-staging-maven-plugin</artifactId>
231-
</plugin>
232-
<plugin>
233-
<artifactId>maven-source-plugin</artifactId>
234-
</plugin>
235-
<plugin>
236-
<artifactId>maven-javadoc-plugin</artifactId>
237-
</plugin>
238-
<plugin>
239-
<artifactId>maven-gpg-plugin</artifactId>
240-
</plugin>
241-
</plugins>
242-
</build>
243-
</profile>
244-
</profiles>
245-
246188
</project>

‎services-gateway-client-transport/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
<artifactId>scalecube-services-gateway-client-transport</artifactId>
1212

1313
<dependencies>
14-
<dependency>
15-
<groupId>io.scalecube</groupId>
16-
<artifactId>scalecube-services-bytebuf-codec</artifactId>
17-
</dependency>
1814
<dependency>
1915
<groupId>io.scalecube</groupId>
2016
<artifactId>scalecube-services-transport-rsocket</artifactId>
@@ -24,10 +20,6 @@
2420
<artifactId>scalecube-services</artifactId>
2521
</dependency>
2622

27-
<dependency>
28-
<groupId>com.fasterxml.jackson.datatype</groupId>
29-
<artifactId>jackson-datatype-jsr310</artifactId>
30-
</dependency>
3123
<dependency>
3224
<groupId>com.fasterxml.jackson.core</groupId>
3325
<artifactId>jackson-core</artifactId>

‎services-gateway-client-transport/src/main/java/io/scalecube/services/gateway/transport/websocket/WebsocketGatewayClientCodec.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.fasterxml.jackson.databind.MappingJsonFactory;
1414
import com.fasterxml.jackson.databind.ObjectMapper;
1515
import com.fasterxml.jackson.databind.SerializationFeature;
16-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1716
import io.netty.buffer.ByteBuf;
1817
import io.netty.buffer.ByteBufAllocator;
1918
import io.netty.buffer.ByteBufInputStream;
@@ -163,7 +162,6 @@ private static ObjectMapper objectMapper() {
163162
mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
164163
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
165164
mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
166-
mapper.registerModule(new JavaTimeModule());
167165
return mapper;
168166
}
169167
}

‎services-gateway-netty/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<artifactId>rsocket-transport-netty</artifactId>
3030
</dependency>
3131

32-
<dependency>
33-
<groupId>com.fasterxml.jackson.datatype</groupId>
34-
<artifactId>jackson-datatype-jsr310</artifactId>
35-
</dependency>
3632
<dependency>
3733
<groupId>com.fasterxml.jackson.core</groupId>
3834
<artifactId>jackson-core</artifactId>

‎services-gateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketServiceMessageCodec.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.fasterxml.jackson.databind.MappingJsonFactory;
1414
import com.fasterxml.jackson.databind.ObjectMapper;
1515
import com.fasterxml.jackson.databind.SerializationFeature;
16-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1716
import io.netty.buffer.ByteBuf;
1817
import io.netty.buffer.ByteBufAllocator;
1918
import io.netty.buffer.ByteBufInputStream;
@@ -167,7 +166,6 @@ private static ObjectMapper objectMapper() {
167166
mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
168167
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
169168
mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
170-
mapper.registerModule(new JavaTimeModule());
171169
return mapper;
172170
}
173171
}

0 commit comments

Comments
 (0)