Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit ecdc0be

Browse files
kbahrkbahr
committed
Merge branch 'release/1.5.0' of github.com:netifi-proteus/proteus-java into release/1.5.0
2 parents 3100931 + 50c53b3 commit ecdc0be

File tree

11 files changed

+33
-43
lines changed

11 files changed

+33
-43
lines changed

‎build.gradle‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ plugins {
88
id 'com.jfrog.artifactory' version '4.7.3'
99
id 'com.jfrog.bintray' version '1.8.4'
1010
id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
11+
id 'com.google.protobuf' version '0.8.5' apply false
1112
}
1213

1314
apply from: 'artifactory.gradle'
@@ -44,12 +45,13 @@ subprojects {
4445
ext['zipkin.sender.version'] = '2.7.6'
4546
ext['hdrhistogram.version'] = '2.1.10'
4647
ext['netty.version'] = '4.1.29.Final'
48+
ext['netty-tcnative.version'] = '2.0.18.Final'
4749
ext['typesafe-config.version'] = '1.3.3'
4850

4951
sourceCompatibility = 1.8
5052
targetCompatibility = 1.8
5153

52-
project.version += project.hasProperty('versionSufix') ? project.property('versionSufix') : ''
54+
project.version += project.hasProperty('versionSuffix') ? project.property('versionSuffix') : ''
5355

5456
repositories {
5557
mavenCentral()
@@ -70,10 +72,15 @@ subprojects {
7072

7173
dependencies {
7274
dependencySet(group: 'com.google.protobuf', version: ext['protobuf.version']) {
75+
entry 'protoc'
7376
entry 'protobuf-java'
7477
entry 'protobuf-java-util'
7578
}
7679

80+
dependencySet( group: 'io.netty', version: ext['netty-tcnative.version']) {
81+
entry 'netty-tcnative'
82+
}
83+
7784
dependency "com.hubspot.jackson:jackson-datatype-protobuf:${ext['jackson-protobuf.version']}"
7885
dependency "com.fasterxml.jackson.core:jackson-databind:${ext['jackson.version']}"
7986
dependency "com.google.guava:guava:${ext['guava.version']}"

‎ci/travis.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "develop" ]
1414
# Develop Branch
1515
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
1616
export ORG_GRADLE_PROJECT_releaseType=snapshot
17-
./gradlew -PversionSufix=".BUILD-SNAPSHOT" clean build artifactoryPublish --stacktrace
17+
./gradlew -PversionSuffix=".BUILD-SNAPSHOT" clean build artifactoryPublish --stacktrace
18+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
19+
# Release Branch
20+
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
21+
./gradlew -PversionSuffix="-RC" clean build artifactoryPublish --stacktrace
1822
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
1923
# Master Branch
2024
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
@@ -29,5 +33,5 @@ else
2933
# Feature Branch
3034
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
3135
export ORG_GRADLE_PROJECT_releaseType=snapshot
32-
./gradlew clean -PversionSufix=".BUILD-SNAPSHOT" build artifactoryPublish --stacktrace
36+
./gradlew clean -PversionSuffix=".BUILD-SNAPSHOT" build artifactoryPublish --stacktrace
3337
fi

‎proteus-access-key-info-idl/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Access Key IDL'
64

@@ -10,7 +8,7 @@ dependencies {
108

119
protobuf {
1210
protoc {
13-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
11+
artifact = "com.google.protobuf:protoc"
1412
}
1513
generateProtoTasks {
1614
all()*.enabled = false

‎proteus-broker-info-idl/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Broker Info IDL'
64

@@ -10,7 +8,7 @@ dependencies {
108

119
protobuf {
1210
protoc {
13-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
11+
artifact = "com.google.protobuf:protoc"
1412
}
1513
generateProtoTasks {
1614
all()*.enabled = false

‎proteus-broker-mgmt-idl/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Broker Management IDL'
64

@@ -10,7 +8,7 @@ dependencies {
108

119
protobuf {
1210
protoc {
13-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
11+
artifact = "com.google.protobuf:protoc"
1412
}
1513
generateProtoTasks {
1614
all()*.enabled = false

‎proteus-client/build.gradle‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Client'
64

@@ -12,7 +10,7 @@ dependencies {
1210
compile 'com.typesafe:config'
1311
compile 'com.google.guava:guava'
1412
compile 'io.rsocket.rpc:rsocket-rpc-core'
15-
compile 'io.netty:netty-tcnative:2.0.18.Final:linux-x86_64'
13+
compile 'io.netty:netty-tcnative::linux-x86_64'
1614

1715
testProtobuf 'io.rsocket.rpc:rsocket-rpc-protobuf-idl'
1816
testCompile project(':proteus-tracing-openzipkin')
@@ -29,7 +27,7 @@ protobuf {
2927
generatedFilesBaseDir = "${projectDir}/src/generated"
3028

3129
protoc {
32-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
30+
artifact = "com.google.protobuf:protoc"
3331
}
3432
plugins {
3533
rsocketRpc {

‎proteus-metrics-micrometer/build.gradle‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
4-
5-
sourceCompatibility = 1.8
6-
targetCompatibility = 1.8
1+
apply plugin: 'com.google.protobuf'
72

83
dependencies {
94
compile project (':proteus-client')
@@ -16,7 +11,7 @@ protobuf {
1611
generatedFilesBaseDir = "${projectDir}/src/generated"
1712

1813
protoc {
19-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
14+
artifact = "com.google.protobuf:protoc"
2015
}
2116
plugins {
2217
rsocketRpc {

‎proteus-metrics-prometheus/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Prometheus Integration'
64

@@ -19,7 +17,7 @@ protobuf {
1917
generatedFilesBaseDir = "${projectDir}/src/generated"
2018

2119
protoc {
22-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
20+
artifact = "com.google.protobuf:protoc"
2321
}
2422
plugins {
2523
rsocketRpc {

‎proteus-tracing-idl/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Tracing IDL'
64

@@ -10,7 +8,7 @@ dependencies {
108

119
protobuf {
1210
protoc {
13-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
11+
artifact = "com.google.protobuf:protoc"
1412
}
1513
generateProtoTasks {
1614
all()*.enabled = false

‎proteus-tracing-openzipkin/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
plugins {
2-
id 'com.google.protobuf' version '0.8.5'
3-
}
1+
apply plugin: 'com.google.protobuf'
42

53
description = 'Netifi Proteus Openzipkin Integration'
64

@@ -22,7 +20,7 @@ protobuf {
2220
generatedFilesBaseDir = "${projectDir}/src/generated"
2321

2422
protoc {
25-
artifact = "com.google.protobuf:protoc:${ext['protobuf.version']}"
23+
artifact = "com.google.protobuf:protoc"
2624
}
2725
plugins {
2826
rsocketRpc {

0 commit comments

Comments
 (0)