Skip to content

Commit 5a9c68c

Browse files
committed
Updated reactor version; updated rsocket; added netty-buffer and netty-commons to fix conflict with rscoket; fixed api change at DelegatedLoopResources
1 parent 889785c commit 5a9c68c

File tree

2 files changed

+16
-32
lines changed

2 files changed

+16
-32
lines changed

pom.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,17 @@
5757
</scm>
5858

5959
<properties>
60-
<scalecube-cluster.version>2.6.6</scalecube-cluster.version>
60+
<scalecube-cluster.version>2.6.7.RC1</scalecube-cluster.version>
6161
<scalecube-commons.version>1.0.12</scalecube-commons.version>
62-
<reactor.version>Dysprosium-SR9</reactor.version>
62+
<reactor.version>2020.0.5</reactor.version>
6363

6464
<jackson.version>2.11.0</jackson.version>
65-
<rsocket.version>1.0.1</rsocket.version>
65+
<rsocket.version>1.0.4</rsocket.version>
6666
<protostuff.version>1.6.0</protostuff.version>
6767
<slf4j.version>1.7.30</slf4j.version>
6868
<log4j.version>2.13.2</log4j.version>
6969
<disruptor.version>3.4.2</disruptor.version>
70+
<netty.version>4.1.60.Final</netty.version>
7071

7172
<jsr305.version>3.0.2</jsr305.version>
7273
<jctools.version>2.1.2</jctools.version>
@@ -182,6 +183,18 @@
182183
<artifactId>jctools-core</artifactId>
183184
<version>${jctools.version}</version>
184185
</dependency>
186+
187+
<!-- Enforcer / Netty -->
188+
<dependency>
189+
<groupId>io.netty</groupId>
190+
<artifactId>netty-buffer</artifactId>
191+
<version>${netty.version}</version>
192+
</dependency>
193+
<dependency>
194+
<groupId>io.netty</groupId>
195+
<artifactId>netty-common</artifactId>
196+
<version>${netty.version}</version>
197+
</dependency>
185198
</dependencies>
186199
</dependencyManagement>
187200

services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/DelegatedLoopResources.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
package io.scalecube.services.transport.rsocket;
22

3-
import io.netty.channel.Channel;
43
import io.netty.channel.EventLoopGroup;
5-
import io.netty.channel.ServerChannel;
64
import io.netty.channel.epoll.Epoll;
7-
import io.netty.channel.epoll.EpollDatagramChannel;
85
import io.netty.channel.epoll.EpollEventLoopGroup;
9-
import io.netty.channel.epoll.EpollServerSocketChannel;
10-
import io.netty.channel.epoll.EpollSocketChannel;
116
import io.netty.channel.nio.NioEventLoopGroup;
12-
import io.netty.channel.socket.DatagramChannel;
13-
import io.netty.channel.socket.nio.NioDatagramChannel;
14-
import io.netty.channel.socket.nio.NioServerSocketChannel;
15-
import io.netty.channel.socket.nio.NioSocketChannel;
167
import io.netty.util.concurrent.DefaultThreadFactory;
178
import io.netty.util.concurrent.Future;
189
import java.util.concurrent.atomic.AtomicBoolean;
@@ -79,26 +70,6 @@ public EventLoopGroup onServerSelect(boolean useNative) {
7970
return bossGroup;
8071
}
8172

82-
@Override
83-
public Class<? extends Channel> onChannel(EventLoopGroup group) {
84-
return Epoll.isAvailable() ? EpollSocketChannel.class : NioSocketChannel.class;
85-
}
86-
87-
@Override
88-
public Class<? extends DatagramChannel> onDatagramChannel(EventLoopGroup group) {
89-
return Epoll.isAvailable() ? EpollDatagramChannel.class : NioDatagramChannel.class;
90-
}
91-
92-
@Override
93-
public Class<? extends ServerChannel> onServerChannel(EventLoopGroup group) {
94-
return Epoll.isAvailable() ? EpollServerSocketChannel.class : NioServerSocketChannel.class;
95-
}
96-
97-
@Override
98-
public boolean preferNative() {
99-
return Epoll.isAvailable();
100-
}
101-
10273
@Override
10374
public boolean daemon() {
10475
return true;

0 commit comments

Comments
 (0)