Updated reactor version; updated rsocket; added netty-buffer and netty-commons to fix conflict with rscoket; fixed api change at DelegatedLoopResources

Author: artem-v

pom.xml

@@ -57,16 +57,17 @@
   </scm>
 
   <properties>
-    <scalecube-cluster.version>2.6.6</scalecube-cluster.version>
+    <scalecube-cluster.version>2.6.7.RC1</scalecube-cluster.version>
     <scalecube-commons.version>1.0.12</scalecube-commons.version>
-    <reactor.version>Dysprosium-SR9</reactor.version>
+    <reactor.version>2020.0.5</reactor.version>
 
     <jackson.version>2.11.0</jackson.version>
-    <rsocket.version>1.0.1</rsocket.version>
+    <rsocket.version>1.0.4</rsocket.version>
     <protostuff.version>1.6.0</protostuff.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>2.13.2</log4j.version>
     <disruptor.version>3.4.2</disruptor.version>
+    <netty.version>4.1.60.Final</netty.version>
 
     <jsr305.version>3.0.2</jsr305.version>
     <jctools.version>2.1.2</jctools.version>
@@ -182,6 +183,18 @@
         <artifactId>jctools-core</artifactId>
         <version>${jctools.version}</version>
       </dependency>
+
+      <!-- Enforcer / Netty -->
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-buffer</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-common</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

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

@@ -1,18 +1,9 @@
 package io.scalecube.services.transport.rsocket;
 
-import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
 import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollDatagramChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.epoll.EpollServerSocketChannel;
-import io.netty.channel.epoll.EpollSocketChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.DatagramChannel;
-import io.netty.channel.socket.nio.NioDatagramChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import io.netty.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -79,26 +70,6 @@ public EventLoopGroup onServerSelect(boolean useNative) {
     return bossGroup;
   }
 
-  @Override
-  public Class<? extends Channel> onChannel(EventLoopGroup group) {
-    return Epoll.isAvailable() ? EpollSocketChannel.class : NioSocketChannel.class;
-  }
-
-  @Override
-  public Class<? extends DatagramChannel> onDatagramChannel(EventLoopGroup group) {
-    return Epoll.isAvailable() ? EpollDatagramChannel.class : NioDatagramChannel.class;
-  }
-
-  @Override
-  public Class<? extends ServerChannel> onServerChannel(EventLoopGroup group) {
-    return Epoll.isAvailable() ? EpollServerSocketChannel.class : NioServerSocketChannel.class;
-  }
-
-  @Override
-  public boolean preferNative() {
-    return Epoll.isAvailable();
-  }
-
   @Override
   public boolean daemon() {
     return true;