Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5889abc
++++ Prepare for next development iteration build: 1387 ++++
io-scalecube-ci Feb 14, 2020
66a2df2
change mapper.enableDefaultTyping to mapper.activateDefaultTyping bec…
linux-china Mar 10, 2020
4a8a178
update to jackson 2.10.0
linux-china Mar 10, 2020
1224e14
Make class public and allow developers to customize ObjectMapper, for…
linux-china Mar 10, 2020
c86c0a1
Make DefaultObjectMapper package private
linux-china Mar 10, 2020
889b984
add jackson-datatype-jdk8 dependency
linux-china Mar 10, 2020
ae814d9
add Jdk8Module for ObjectMapper
linux-china Mar 10, 2020
acdba51
Introduce auto-discover ObjectMapper's modules by findAndRegisterModu…
linux-china Mar 11, 2020
11c3edd
imports optimized
linux-china Mar 11, 2020
a8a53da
Merge pull request #308 from linux-china/develop
artem-v Mar 12, 2020
b01af4f
updated: travis ci configuration file
io-scalecube-ci Mar 17, 2020
22414e2
Merge pull request #310 from scalecube/travis-ci-cd
artem-v Mar 19, 2020
7ab8859
updated: travis ci configuration file
io-scalecube-ci Mar 21, 2020
e871b6b
Merge pull request #313 from scalecube/travis-ci-cd
artem-v Mar 21, 2020
c0814f7
Updated sc-parent to 0.1.X
artem-v Mar 21, 2020
5443fae
Merge pull request #314 from scalecube/update/sc-parent-to-latest
artem-v Mar 22, 2020
4d5fe15
Update reactor and netty versions
segabriel Apr 29, 2020
3b5533a
Update parent version
segabriel Apr 29, 2020
398bee4
Update jackson version
segabriel Apr 29, 2020
6f16b2b
Update log4j version
segabriel Apr 29, 2020
22f247f
Merge pull request #315 from scalecube/update-versions
artem-v Apr 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-cluster-parent</artifactId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>

<artifactId>scalecube-cluster-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cluster-testlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>scalecube-cluster-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 1 addition & 3 deletions cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-cluster-parent</artifactId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>

<artifactId>scalecube-cluster</artifactId>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion codec-parent/codec-jackson-smile/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-codec-parent</artifactId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>

<artifactId>scalecube-codec-jackson-smile</artifactId>
Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
6 changes: 5 additions & 1 deletion codec-parent/codec-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>scalecube-codec-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion codec-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>scalecube-cluster-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand Down
4 changes: 1 addition & 3 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-cluster-parent</artifactId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>

<artifactId>scalecube-cluster-examples</artifactId>
Expand All @@ -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>

Expand Down
30 changes: 24 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>scalecube-cluster-parent</artifactId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-parent-pom</artifactId>
<version>0.0.19</version>
<version>0.1.1</version>
</parent>
<packaging>pom</packaging>

Expand All @@ -17,15 +17,16 @@
<connection>scm:git:git@github.com:scalecube/scalecube-cluster.git</connection>
<developerConnection>scm:git:git@github.com:scalecube/scalecube-cluster.git
</developerConnection>
<tag>v2.4.10</tag>
<tag>HEAD</tag>
</scm>

<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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions transport-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>scalecube-cluster-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>

<artifactId>scalecube-transport-parent</artifactId>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion transport-parent/transport-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>scalecube-transport-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion transport-parent/transport-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>scalecube-transport-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.10</version>
<version>2.4.11-SNAPSHOT</version>
</parent>

<artifactId>scalecube-transport-netty</artifactId>
Expand Down