Skip to content

Commit cc6b75d

Browse files
committed
Merge branch 'master' into develop
# Conflicts: # pom.xml # services-api/pom.xml # services-benchmarks/pom.xml # services-bytebuf-codec/pom.xml # services-discovery/pom.xml # services-examples-parent/pom.xml # services-examples-parent/services-examples-runner/pom.xml # services-examples-parent/services-examples/pom.xml # services-transport-parent/pom.xml # services-transport-parent/services-transport-jackson/pom.xml # services-transport-parent/services-transport-protostuff/pom.xml # services-transport-parent/services-transport-rsocket/pom.xml # services/pom.xml
2 parents d2c26b4 + 5856d0f commit cc6b75d

File tree

14 files changed

+14
-13
lines changed

14 files changed

+14
-13
lines changed

docs/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hello world

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<artifactId>scalecube-services-parent</artifactId>
6-
<version>2.8.10-SNAPSHOT</version>
6+
<version>2.9.0-SNAPSHOT</version>
77

88
<parent>
99
<groupId>io.scalecube</groupId>

services-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.scalecube</groupId>
88
<artifactId>scalecube-services-parent</artifactId>
9-
<version>2.8.10-SNAPSHOT</version>
9+
<version>2.9.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>scalecube-services-api</artifactId>

services-benchmarks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>scalecube-services-parent</artifactId>
77
<groupId>io.scalecube</groupId>
8-
<version>2.8.10-SNAPSHOT</version>
8+
<version>2.9.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>scalecube-services-benchmarks</artifactId>

services-bytebuf-codec/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.scalecube</groupId>
66
<artifactId>scalecube-services-parent</artifactId>
7-
<version>2.8.10-SNAPSHOT</version>
7+
<version>2.9.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scalecube-services-bytebuf-codec</artifactId>

services-discovery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.scalecube</groupId>
66
<artifactId>scalecube-services-parent</artifactId>
7-
<version>2.8.10-SNAPSHOT</version>
7+
<version>2.9.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scalecube-services-discovery</artifactId>

services-examples-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.scalecube</groupId>
77
<artifactId>scalecube-services-parent</artifactId>
8-
<version>2.8.10-SNAPSHOT</version>
8+
<version>2.9.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>scalecube-services-examples-parent</artifactId>

services-examples-parent/services-examples-runner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>scalecube-services-examples-parent</artifactId>
55
<groupId>io.scalecube</groupId>
6-
<version>2.8.10-SNAPSHOT</version>
6+
<version>2.9.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

services-examples-parent/services-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.scalecube</groupId>
66
<artifactId>scalecube-services-examples-parent</artifactId>
7-
<version>2.8.10-SNAPSHOT</version>
7+
<version>2.9.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>scalecube-services-examples</artifactId>

services-transport-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.scalecube</groupId>
77
<artifactId>scalecube-services-parent</artifactId>
8-
<version>2.8.10-SNAPSHOT</version>
8+
<version>2.9.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>scalecube-services-transport-parent</artifactId>

0 commit comments

Comments
 (0)