Merge pull request #316 from scalecube/develop

Prepare release

Author: segabriel

.travis.yml

@@ -1,18 +1,10 @@
-env:
-  global:
-    - clusterTransport=warn
-    - clusterFdetector=warn
-    - clusterGossip=warn
-    - clusterMembership=warn
-    - clusterMetadata=warn
-    - clusterUtils=warn
 addons:
   apt:
     packages:
     - libxml-xpath-perl
 sudo: required
 language: java
-jdk: openjdk8
+jdk: openjdk11
 before_install:
 - "./src/main/scripts/ci/before-install.sh"
 - "./src/main/scripts/cd/before-deploy.sh"

cluster/pom.xml

@@ -42,13 +42,11 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

codec-parent/codec-jackson-smile/pom.xml

@@ -28,6 +28,10 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

codec-parent/codec-jackson-smile/src/main/java/io/scalecube/cluster/codec/jackson/smile/DefaultObjectMapper.java

@@ -28,10 +28,11 @@ private static ObjectMapper initMapper() {
     mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
-    mapper.enableDefaultTyping(
+    mapper.activateDefaultTyping(
         LaissezFaireSubTypeValidator.instance,
         DefaultTyping.JAVA_LANG_OBJECT,
         JsonTypeInfo.As.WRAPPER_OBJECT);
+    mapper.findAndRegisterModules();
     return mapper;
   }
 }

codec-parent/codec-jackson/pom.xml

@@ -23,6 +23,10 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

codec-parent/codec-jackson/src/main/java/io/scalecube/cluster/codec/jackson/DefaultObjectMapper.java

@@ -27,10 +27,11 @@ private static ObjectMapper initMapper() {
     mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
-    mapper.enableDefaultTyping(
+    mapper.activateDefaultTyping(
         LaissezFaireSubTypeValidator.instance,
         DefaultTyping.JAVA_LANG_OBJECT,
         JsonTypeInfo.As.WRAPPER_OBJECT);
+    mapper.findAndRegisterModules();
     return mapper;
   }
 }

examples/pom.xml

@@ -29,12 +29,10 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>${log4j.version}</version>
     </dependency>
   </dependencies>
 

pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-parent-pom</artifactId>
-    <version>0.0.19</version>
+    <version>0.1.1</version>
   </parent>
   <packaging>pom</packaging>
 
@@ -23,9 +23,10 @@
   <properties>
     <scalecube-commons.version>1.0.1</scalecube-commons.version>
     <slf4j.version>1.7.30</slf4j.version>
-    <log4j.version>2.8.2</log4j.version>
-    <reactor.version>Dysprosium-RELEASE</reactor.version>
-    <jackson.version>2.10.0.pr1</jackson.version>
+    <log4j.version>2.13.2</log4j.version>
+    <reactor.version>Dysprosium-SR7</reactor.version>
+    <netty.version>4.1.48.Final</netty.version>
+    <jackson.version>2.11.0</jackson.version>
 
     <mockito-junit-jupiter.version>2.27.0</mockito-junit-jupiter.version>
     <junit-jupiter.version>5.1.1</junit-jupiter.version>
@@ -89,6 +90,14 @@
         <version>${slf4j.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-bom</artifactId>
+        <version>${log4j.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- Reactor -->
       <dependency>
         <groupId>io.projectreactor</groupId>
@@ -98,6 +107,15 @@
         <scope>import</scope>
       </dependency>
 
+      <!--  Netty    -->
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>${netty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- Scalecube Commons -->
       <dependency>
         <groupId>io.scalecube</groupId>

transport-parent/pom.xml

@@ -32,13 +32,11 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>