Skip to content

Commit c61d35b

Browse files
gregwhitakergregwhitaker
committed
Upgrading to Proteus 1.5.0
1 parent d3a9b48 commit c61d35b

File tree

6 files changed

+72
-25
lines changed

6 files changed

+72
-25
lines changed

‎build.gradle‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ subprojects {
66

77
// Proteus Versions
88
ext {
9-
proteusVersion = '1.5.0-RC'
9+
proteusVersion = '1.5.0'
1010
rsocketRpcVersion = '0.2.4'
1111
}
1212

@@ -15,12 +15,5 @@ subprojects {
1515
maven {
1616
url 'https://dl.bintray.com/netifi/netifi-oss/'
1717
}
18-
maven {
19-
url = version.contains('SNAPSHOT') ? 'https://artifactory.netifiinc.com/artifactory/libs-snapshot-local' : 'https://artifactory.netifiinc.com/artifactory/libs-release-local'
20-
credentials {
21-
username = project.hasProperty('netifiArtifactoryUsername') ? project.property('netifiArtifactoryUsername') : System.getenv('NETIFI_ARTIFACTORY_USERNAME')
22-
password = project.hasProperty('netifiArtifactoryPassword') ? project.property('netifiArtifactoryPassword') : System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
23-
}
24-
}
2518
}
2619
}

‎client/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
<parent>
77
<groupId>io.netifi.proteus.quickstart</groupId>
88
<artifactId>proteus-quickstart</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>1.5.0</version>
1010
</parent>
1111

1212
<artifactId>client</artifactId>
1313
<name>client</name>
14-
<version>1.0-SNAPSHOT</version>
14+
<version>1.5.0</version>
1515
<packaging>jar</packaging>
1616

17-
1817
<dependencies>
1918
<dependency>
2019
<groupId>io.netifi.proteus.quickstart</groupId>
2120
<artifactId>service-idl</artifactId>
22-
<version>1.0-SNAPSHOT</version>
21+
<version>1.5.0</version>
2322
<scope>compile</scope>
2423
</dependency>
2524
<dependency>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

‎pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.netifi.proteus.quickstart</groupId>
55
<artifactId>proteus-quickstart</artifactId>
6-
<version>1.0-SNAPSHOT</version>
6+
<version>1.5.0</version>
77
<packaging>pom</packaging>
88
<name>multi</name>
9+
910
<modules>
1011
<module>client</module>
1112
<module>service</module>
1213
<module>service-idl</module>
1314
</modules>
15+
1416
<properties>
1517
<maven.compiler.target>1.8</maven.compiler.target>
1618
<maven.compiler.source>1.8</maven.compiler.source>
17-
<proteusVersion>0.9.0</proteusVersion>
18-
<rsocketRpcVersion>0.2.0</rsocketRpcVersion>
19+
<proteusVersion>1.5.0</proteusVersion>
20+
<rsocketRpcVersion>0.2.4</rsocketRpcVersion>
1921
<protobufVersion>3.6.0</protobufVersion>
2022
<log4j2Version>2.9.0</log4j2Version>
2123
</properties>
24+
2225
<repositories>
2326
<repository>
2427
<id>jcenter</id>

‎service-idl/pom.xml‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,47 @@
77
<parent>
88
<groupId>io.netifi.proteus.quickstart</groupId>
99
<artifactId>proteus-quickstart</artifactId>
10-
<version>1.0-SNAPSHOT</version>
10+
<version>1.5.0</version>
1111
</parent>
1212

1313
<artifactId>service-idl</artifactId>
1414
<name>service-idl</name>
15-
<version>1.0-SNAPSHOT</version>
15+
<version>1.5.0</version>
1616
<packaging>jar</packaging>
17+
1718
<dependencies>
19+
<dependency>
20+
<groupId>io.netifi.proteus</groupId>
21+
<artifactId>proteus-client</artifactId>
22+
<version>${proteusVersion}</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>io.netifi.proteus</groupId>
26+
<artifactId>proteus-metrics-micrometer</artifactId>
27+
<version>${proteusVersion}</version>
28+
<exclusions>
29+
<exclusion>
30+
<groupId>io.rsocket.rpc</groupId>
31+
<artifactId>rsocket-rpc-protobuf</artifactId>
32+
</exclusion>
33+
</exclusions>
34+
</dependency>
35+
<dependency>
36+
<groupId>io.netifi.proteus</groupId>
37+
<artifactId>proteus-tracing-openzipkin</artifactId>
38+
<version>${proteusVersion}</version>
39+
<exclusions>
40+
<exclusion>
41+
<groupId>io.rsocket.rpc</groupId>
42+
<artifactId>rsocket-rpc-protobuf</artifactId>
43+
</exclusion>
44+
</exclusions>
45+
</dependency>
46+
<dependency>
47+
<groupId>javax.inject</groupId>
48+
<artifactId>javax.inject</artifactId>
49+
<version>1</version>
50+
</dependency>
1851
<dependency>
1952
<groupId>io.rsocket.rpc</groupId>
2053
<artifactId>rsocket-rpc-core</artifactId>
@@ -42,12 +75,31 @@
4275
</extension>
4376
</extensions>
4477
<plugins>
78+
<plugin>
79+
<groupId>org.codehaus.mojo</groupId>
80+
<artifactId>build-helper-maven-plugin</artifactId>
81+
<executions>
82+
<execution>
83+
<phase>generate-sources</phase>
84+
<goals>
85+
<goal>add-source</goal>
86+
</goals>
87+
<configuration>
88+
<sources>
89+
<source>${project.build.directory}/generated-sources/protobuf/java</source>
90+
<source>${project.build.directory}/generated-sources/protobuf/rsocketRpc</source>
91+
</sources>
92+
</configuration>
93+
</execution>
94+
</executions>
95+
</plugin>
4596
<plugin>
4697
<groupId>org.xolstice.maven.plugins</groupId>
4798
<artifactId>protobuf-maven-plugin</artifactId>
4899
<version>0.5.1</version>
49100
<configuration>
50-
<protocArtifact>com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
101+
<protocArtifact>
102+
com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}
51103
</protocArtifact>
52104
<pluginId>rsocketRpc</pluginId>
53105
<pluginArtifact>
@@ -65,5 +117,4 @@
65117
</plugin>
66118
</plugins>
67119
</build>
68-
69120
</project>

‎service/pom.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
<parent>
77
<groupId>io.netifi.proteus.quickstart</groupId>
88
<artifactId>proteus-quickstart</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>1.5.0</version>
1010
</parent>
1111

1212
<artifactId>service</artifactId>
1313
<name>service</name>
14-
<version>1.0-SNAPSHOT</version>
14+
<version>1.5.0</version>
1515
<packaging>jar</packaging>
16+
1617
<dependencies>
1718
<dependency>
1819
<groupId>io.netifi.proteus.quickstart</groupId>
1920
<artifactId>service-idl</artifactId>
20-
<version>1.0-SNAPSHOT</version>
21+
<version>1.5.0</version>
2122
<scope>compile</scope>
2223
</dependency>
2324
<dependency>
@@ -47,7 +48,7 @@
4748
</dependency>
4849
</dependencies>
4950

50-
<build>
51+
<build>
5152
<plugins>
5253
<plugin>
5354
<groupId>org.codehaus.mojo</groupId>
@@ -58,5 +59,5 @@
5859
</configuration>
5960
</plugin>
6061
</plugins>
61-
</build>
62+
</build>
6263
</project>

0 commit comments

Comments
 (0)