Skip to content

Commit b1d9a5f

Browse files
mostroverkhovmostroverkhov
committed
Merge branch 'release/1.6.1'
2 parents 129ee63 + bdffaa7 commit b1d9a5f

File tree

7 files changed

+58
-27
lines changed

7 files changed

+58
-27
lines changed

‎build.gradle‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@ subprojects {
66
apply plugin: 'idea'
77
apply plugin: 'io.spring.dependency-management'
88

9-
group 'io.netifi.proteus.quickstart'
10-
version '1.6.0'
11-
129
dependencyManagement {
1310
imports {
14-
mavenBom "io.netifi.proteus:proteus-rsocket-bom:1.6.0"
15-
mavenBom "io.netifi.proteus:proteus-bom:1.6.0"
16-
mavenBom "io.netifi.proteus:proteus-common-dependencies:1.6.0"
11+
mavenBom "io.netifi.proteus:proteus-bom:${proteusBomVersion}"
12+
mavenBom "org.apache.logging.log4j:log4j-bom:${log4j2Version}"
13+
}
14+
15+
dependencies {
16+
dependency "com.google.protobuf:protobuf-java:${protobufVersion}"
17+
dependency "com.google.protobuf:protoc:${protobufVersion}"
18+
dependency "io.rsocket:rsocket-core:${rsocketVersion}"
19+
dependency "io.rsocket:rsocket-transport-netty:${rsocketVersion}"
20+
dependency "io.rsocket.rpc:rsocket-rpc-protobuf:${rsocketRpcVersion}"
21+
dependency "io.rsocket.rpc:rsocket-rpc-core:${rsocketRpcVersion}"
1722
}
1823
}
1924

‎client/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>io.netifi.proteus.quickstart</groupId>
88
<artifactId>proteus-quickstart</artifactId>
9-
<version>1.6.0</version>
9+
<version>1.6.1</version>
1010
</parent>
1111

1212
<artifactId>client</artifactId>
1313
<name>client</name>
14-
<version>1.6.0</version>
14+
<version>1.6.1</version>
1515
<packaging>jar</packaging>
1616

1717
<dependencies>
@@ -51,6 +51,7 @@
5151
<version>1.6.0</version>
5252
<configuration>
5353
<mainClass>io.netifi.proteus.quickstart.client.Main</mainClass>
54+
<cleanupDaemonThreads>false</cleanupDaemonThreads>
5455
</configuration>
5556
</plugin>
5657
</plugins>

‎docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.7'
33

44
services:
55
broker1:
6-
image: netifi/proteus:1.6.0
6+
image: netifi/proteus:1.6.1
77
restart: always
88
networks:
99
- netifi

‎gradle.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
group=io.netifi.proteus.quickstart
2+
version=1.6.1
3+
4+
log4j2Version=2.11.2
5+
proteusBomVersion=1.6.1
6+
protobufVersion=3.6.1
7+
rsocketVersion=0.11.17.2
8+
rsocketRpcVersion=0.2.13.3

‎pom.xml‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.netifi.proteus.quickstart</groupId>
55
<artifactId>proteus-quickstart</artifactId>
6-
<version>1.6.0</version>
6+
<version>1.6.1</version>
77
<packaging>pom</packaging>
88
<name>multi</name>
99

@@ -16,32 +16,49 @@
1616
<properties>
1717
<maven.compiler.target>1.8</maven.compiler.target>
1818
<maven.compiler.source>1.8</maven.compiler.source>
19-
<protobufVersion>3.6.1</protobufVersion>
20-
<rsocketRpcVersion>0.2.13.3</rsocketRpcVersion>
19+
<log4j2.version>2.11.2</log4j2.version>
20+
<proteus.bom.version>1.6.1</proteus.bom.version>
21+
<protobuf.version>3.6.1</protobuf.version>
22+
<rsocket.version>0.11.17.2</rsocket.version>
23+
<rsocket.rpc.version>0.2.13.3</rsocket.rpc.version>
2124
</properties>
2225

2326
<dependencyManagement>
2427
<dependencies>
2528
<dependency>
2629
<groupId>io.netifi.proteus</groupId>
27-
<artifactId>proteus-rsocket-bom</artifactId>
28-
<version>1.6.0</version>
30+
<artifactId>proteus-bom</artifactId>
31+
<version>${proteus.bom.version}</version>
2932
<type>pom</type>
3033
<scope>import</scope>
3134
</dependency>
3235
<dependency>
33-
<groupId>io.netifi.proteus</groupId>
34-
<artifactId>proteus-bom</artifactId>
35-
<version>1.6.0</version>
36+
<groupId>org.apache.logging.log4j</groupId>
37+
<artifactId>log4j-bom</artifactId>
38+
<version>${log4j2.version}</version>
3639
<type>pom</type>
3740
<scope>import</scope>
3841
</dependency>
42+
3943
<dependency>
40-
<groupId>io.netifi.proteus</groupId>
41-
<artifactId>proteus-common-dependencies</artifactId>
42-
<version>1.6.0</version>
43-
<type>pom</type>
44-
<scope>import</scope>
44+
<groupId>com.google.protobuf</groupId>
45+
<artifactId>protobuf-java</artifactId>
46+
<version>${protobuf.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>io.rsocket</groupId>
50+
<artifactId>rsocket-core</artifactId>
51+
<version>${rsocket.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>io.rsocket</groupId>
55+
<artifactId>rsocket-transport-netty</artifactId>
56+
<version>${rsocket.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>io.rsocket.rpc</groupId>
60+
<artifactId>rsocket-rpc-core</artifactId>
61+
<version>${rsocket.rpc.version}</version>
4562
</dependency>
4663
</dependencies>
4764
</dependencyManagement>

‎service-idl/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.netifi.proteus.quickstart</groupId>
99
<artifactId>proteus-quickstart</artifactId>
10-
<version>1.6.0</version>
10+
<version>1.6.1</version>
1111
</parent>
1212

1313
<artifactId>service-idl</artifactId>
1414
<name>service-idl</name>
15-
<version>1.6.0</version>
15+
<version>1.6.1</version>
1616
<packaging>jar</packaging>
1717

1818
<dependencies>
@@ -59,11 +59,11 @@
5959
<version>0.6.1</version>
6060
<configuration>
6161
<protocArtifact>
62-
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
62+
com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
6363
</protocArtifact>
6464
<pluginId>rsocketRpc</pluginId>
6565
<pluginArtifact>
66-
io.rsocket.rpc:rsocket-rpc-protobuf:${rsocketRpcVersion}:exe:${os.detected.classifier}
66+
io.rsocket.rpc:rsocket-rpc-protobuf:${rsocket.rpc.version}:exe:${os.detected.classifier}
6767
</pluginArtifact>
6868
</configuration>
6969
<executions>

‎service/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.netifi.proteus.quickstart</groupId>
88
<artifactId>proteus-quickstart</artifactId>
9-
<version>1.6.0</version>
9+
<version>1.6.1</version>
1010
</parent>
1111

1212
<artifactId>service</artifactId>

0 commit comments

Comments
 (0)