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

Commit 3100931

Browse files
rdegnanrdegnan
committed
Merge branch 'develop' into release/1.5.0
2 parents aab6690 + 1e15cfe commit 3100931

File tree

19 files changed

+304
-324
lines changed

19 files changed

+304
-324
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: java
22
sudo: required
33
jdk: oraclejdk8
4-
script: gradle/buildViaTravis.sh
4+
script: ci/travis.sh
55
before_cache:
66
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
77
notifications:
@@ -11,9 +11,3 @@ cache:
1111
- "$HOME/.gradle/caches/"
1212
- "$HOME/.gradle/wrapper/"
1313
- "$HOME/.m2"
14-
env:
15-
global:
16-
- secure: crwXv5Q/iCtIIC81QWgWYNfuGJxSQQjVn83vvRoRMXmfSZ02NnQfDos+p1GxxbIXLUQ8NsaLc8cg0o2PQgsK/l0d7nDExix5Rt+AwzU4UOrUcZh46MgEeZDow4q6ySToOHaeKsaRnbTIpAwU28o9fnZ9ViaQ7s2uZWQZXYigGf0PN1ca9E8MJ6VEMvp34e2wJok6woaWG9ALCL2b5viofTv0zdHXWfGV4rdz9Rq0fThmFn4BlmHdcTwGt2ZLdWcEbzv0qNYNAiVvNJd4uWHOnjRceslAZ/JZxgIzSHK0ctNiZdc9rRNo8BHGQqKvmZqmbzUAU07uS0+iLBnm89KKJyQCXKulDv7NM0ShiFexMQ17TUOdlJtH65ypzUIJ+sbSOj2M+NhThUD8OQlebvjKF6t8M9f1NIXkkH/Xw2XJ146ANBcGyjALVFDIqlKIyCtIoY3/teQWccfbAzBglC24QBizpfgmdBEGOJXs2qR0NxzcIRNc1o9XPyT9BJxa+9JnHyHbF+LG07j1LfaaJSQBIYL7xjDBwEEIOEmP3UrISwjvs1fOQA3oYINguXtl7qi3wNylv35e5xw5acijcTTYHRSY6A5rPdokbK0fCQHCrHldBYDc8Bvy+GnjnYQHynjdWGbTnkvMgvYe2aHD+mH5pO5V7DRYHhnJsuMuscRIELc=
17-
- secure: ZMu9rhzTT1F6pyqqrd0TGhAeUGigAvGZT5rJv2ifZJEB8+FOQ+/ylJ/Q3Gq9Wx8quWVR/ocTWF8yEuA1BlZF1Z+tfOcCXOaYPrgMFNhgmETK9X1AQN1gahkTzLNWEZUzKwte5IwaDYDwMe54VcJpY9/f7R6ZyjKVEJOLCjnJ+YLR2rjttsug9ZurH3iLzdgRGMHyI55+dz83MkdumkkATFAeLnQepdL2n4ijD0NvuzvlvaU+Knz9AZCX2kSNDM+hn+K0fFDM4CBFduBi8gEYmRlnSXslHtfwuZRViZQaS4voRMAFmWPNCH67ya3f1voi41BWXgaGTW5He8XDjQtFcIphvykmMOsS4ka9u4K0LEbReoSBRwBUAhigGMFXB1lMup66+WvjvSvwS9rMVVGaXpVGjgpM5shWpiIEoWICWU+Pu5ihk9BWv61/tYNNw6u3QlXt1ZfjM50F7eoJ1ctfYqClrlD3iwrBJ47aIu4kH1HdCp9uxkxq+Cz75n2UdV6Py7eEW1N141fnZ/Iax8nzbNu4SxccsJn1yUv22LJCteW3//GqvRVa7hets587PFpfkyaraBLNBvh90/wouXK/yvYBZN4WK7VwnuCUmxTjTglT9mQGUgPOYNMDU/m7rDp2zDc+8aMEfQjWGktH93M0g1l9yhidc8AMQbyAaxkk73M=
18-
- secure: hxmPq8HtqUN04I639LiDA6euoWW8ziWs70USv7nwRLSE0gV/oDrwFrDX5QJNP4rP04hD/UCll0jKZPHClVjXfW7s9U2wqrFlyJifFoefQms7HZIselUuRXAjkK7KVA8ur1kz+6Ox3Ji7gxUnkF9cGR+rGAHyllSmuD+UIw2vCUHcqAAlhYzN9NfenjqEBNTQ5QTR0p1I37fDLsxORxTjuUxQO0yaYv1sy0eUUbDSR0XN0VrN/sNFMkV6+m5+A+7/4LYqxmZxyRqSC4Qk726k8Eab0K/QCnxE3TO/QoAPk9QZ2BEtHbrycNhm9yxG9+CGNbZCpQaWH1BEeo5F9B6u1prbikqzd9cTSuLGqR1r4wBDuIDFB8RloOMvoB0Z5+CWeP8X9u7q13vFFDS26crMWbqCCoo9Vcel8Js1H8/awnYrxtYhBk4BRGDzgUfRzaru+GpjE3s1kppkjj01qUo3fN9P+Px/zISPD9OdMgVvdN0O3rGPYHniFS9lQJZaJSJUU8hlApqsTQfK+5j8vIKmPe0ur39XriVeC8Kam8SWMymjLrLaNGOe0XvST9MLKKel7Aj9mknNyZ0dQEr24BLlN/vGHQsHTrpnReLHP3szuF5FXZQsqYQ2uN4Q5000O6IJfbD9FcBJHzOCtyIlNkJ12qK6GiLChwqcpv9muQZcaH8=
19-
- secure: fyh1tUQJBijuGd5jO6ZHl2yn8u5uKgz+9tKgrGNBg2NNlxXvq1TJqBj1/fkZonH3rxPAH4AnmxsR4ktWKhmTci16D3ATflpxVOSQYHdMqbsxpNt4e+um/lnFLp6WORLkcnFAsA0rUrH3eRJXPfZ6YgcY3L4tddiT0sqLZ1ECo5gA915CPN8ANioHzooWJgVBcbr34z2HcJudgKws4C+MoiTKv3C9Ijamg+30D/wgiyRJXPD/azb2KoVx+Bk5yIQuBOl3G/a/LMpK+kv/2jZQjUT/gnKLEvRu9H5xJIL41mFTRgmZxD9E0Rb0VeAaYICfo+4K2g2smXeA/Eb9lmwMQYiEKdG2IH2chjPggBM0hsB42pGc+mFDKaNCtQSVkbQkrg2CmDMwvBaL7IBFNUmlSbZfG1PeQluSNs9uECR0MFM/zyNECLGkcrf3kZXHMuQ+1jYPWf37CuiNbEnN8sQm65t9wqX3TqRB8rksGaThVvYizIon7zuuIrKINynGDEc3ygVUOeOBLT+U9AaF1jatkxuwiZ/VJaReYuJvH76wCUb6k91RQA9udK4n8h8aMomOmTyIWRSnEFObDs1RW6Lixh5PRShTKG8ffoY0vM5IO5i17dPFOmIRo99yqKiWPcfQLK8IP0SiCwc6w0pqAns6H/r8qBgk6BoXGnBT5kyzKr8=

‎artifactory.gradle‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright 2015-2018 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
if (project.hasProperty('netifiArtifactoryUsername') && project.hasProperty('netifiArtifactoryPassword')) {
18+
19+
subprojects {
20+
plugins.withId('com.jfrog.artifactory') {
21+
artifactory {
22+
publish {
23+
contextUrl = 'artifactory.netifiinc.com'
24+
25+
repository {
26+
repoKey = version.contains('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local'
27+
28+
// Credentials for oss.jfrog.org are a user's Bintray credentials
29+
username = project.property('netifiArtifactoryUsername')
30+
password = project.property('netifiArtifactoryPassword')
31+
}
32+
33+
defaults {
34+
publications('maven')
35+
}
36+
}
37+
}
38+
}
39+
}
40+
}

‎bintray.gradle‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright 2015-2018 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
18+
19+
subprojects {
20+
plugins.withId('com.jfrog.bintray') {
21+
bintray {
22+
user = project.property('bintrayUser')
23+
key = project.property('bintrayKey')
24+
25+
publications = ['mavenJava']
26+
27+
//dryRun = true
28+
publish = (osdetector.os == 'osx')
29+
override = true
30+
31+
pkg {
32+
repo = 'netifi-oss'
33+
name = project.name
34+
userOrg = 'netifi'
35+
desc = "${project.description}"
36+
websiteUrl = 'https://github.com/netifi-proteus/proteus-java'
37+
issueTrackerUrl = 'https://github.com/netifi-proteus/proteus-java/issues'
38+
vcsUrl = 'https://github.com/netifi-proteus/proteus-java.git'
39+
licenses = ['Apache-2.0']
40+
githubRepo = 'netifi-proteus/proteus-java'
41+
githubReleaseNotesFile = 'CHANGELOG.md'
42+
43+
version {
44+
name = "$project.version".toString()
45+
}
46+
}
47+
}
48+
}
49+
}
50+
}

‎build.gradle‎

Lines changed: 146 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,159 @@
1-
buildscript {
2-
repositories {
3-
jcenter()
4-
}
5-
dependencies {
6-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
7-
}
8-
}
9-
101
plugins {
11-
id 'com.gradle.build-scan' version '1.15.1' // declare before any other plugin
2+
id 'com.gradle.build-scan' version '1.16' // declare before any other plugin
123
id 'com.google.osdetector' version '1.4.0'
134
id 'com.github.sherter.google-java-format' version '0.7.1' apply false
145
id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
15-
id 'me.champeau.gradle.jmh' version '0.4.4' apply false
6+
id 'me.champeau.gradle.jmh' version '0.4.7' apply false
167
id 'io.morethan.jmhreport' version '0.6.2.1' apply false
8+
id 'com.jfrog.artifactory' version '4.7.3'
9+
id 'com.jfrog.bintray' version '1.8.4'
10+
id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
1711
}
1812

19-
buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
20-
21-
project(':proteus-auth') {
22-
description = 'Netifi Proteus Authentication Utilities'
23-
ext.artifactName = 'proteus-auth'
24-
25-
apply from: file('../gradle/java.gradle')
26-
}
27-
28-
project(':proteus-access-key-info-idl') {
29-
description = 'Netifi Proteus Access Key IDL'
30-
ext.artifactName = 'proteus-access-key-info-idl'
31-
32-
apply from: file('../gradle/java.gradle')
33-
}
34-
35-
project(':proteus-broker-info-idl') {
36-
description = 'Netifi Proteus Broker Info IDL'
37-
ext.artifactName = 'proteus-broker-info-idl'
38-
39-
apply from: file('../gradle/java.gradle')
40-
}
41-
42-
project(':proteus-broker-mgmt-idl') {
43-
description = 'Netifi Proteus Broker Management IDL'
44-
ext.artifactName = 'proteus-broker-mgmt-idl'
45-
46-
apply from: file('../gradle/java.gradle')
47-
}
48-
49-
project(':proteus-frames') {
50-
description = 'Netifi Proteus Frames'
51-
ext.artifactName = 'proteus-frames'
52-
53-
apply from: file('../gradle/java.gradle')
54-
}
55-
56-
project(':proteus-client') {
57-
description = 'Netifi Proteus Client'
58-
ext.artifactName = 'proteus-client'
59-
60-
apply from: file('../gradle/java.gradle')
61-
}
62-
63-
project(':proteus-metrics-micrometer') {
64-
description = 'Netifi Proteus Micrometer Support'
65-
ext.artifactName = 'proteus-metrics-micrometer'
66-
67-
apply from: file('../gradle/java.gradle')
68-
}
69-
70-
project(':proteus-metrics-prometheus') {
71-
description = 'Netifi Proteus Prometheus Integration'
72-
ext.artifactName = 'proteus-metrics-prometheus'
73-
74-
apply from: file('../gradle/java.gradle')
75-
}
76-
77-
project(':proteus-tracing-openzipkin') {
78-
description = 'Netifi Proteus Openzipkin Integration'
79-
ext.artifactName = 'proteus-tracing-openzipkin'
13+
apply from: 'artifactory.gradle'
14+
apply from: 'bintray.gradle'
8015

81-
apply from: file('../gradle/java.gradle')
82-
}
16+
buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
8317

18+
subprojects {
19+
apply plugin: 'io.spring.dependency-management'
20+
apply plugin: 'com.jfrog.bintray'
21+
apply plugin: 'java'
22+
apply plugin: 'idea'
23+
apply plugin: 'com.github.sherter.google-java-format'
24+
apply plugin: 'maven'
25+
apply plugin: 'maven-publish'
26+
27+
ext['reactor-bom.version'] = 'Californium-SR1'
28+
ext['rsocket.version'] = '0.11.9'
29+
ext['rsocket-rpc.version'] = '0.2.4'
30+
31+
ext['jackson.version'] = '2.9.7'
32+
ext['jackson-protobuf.version'] = '0.9.10-jackson2.9-proto3'
33+
ext['guava.version'] = '22.0'
34+
ext['protobuf.version'] = '3.6.1'
35+
ext['log4j.version'] = '2.9.0'
36+
ext['junit.version'] = '5.1.0'
37+
ext['mockito.version'] = '2.23.0'
38+
ext['hamcrest.version'] = '1.3'
39+
ext['jmh.version'] = '1.2.0'
40+
ext['micrometer.version'] = '1.0.6'
41+
ext['assertj.version'] = '3.11.1'
42+
ext['opentracing.version'] = '0.31.0'
43+
ext['opentracing.brave.version'] = '0.31.2'
44+
ext['zipkin.sender.version'] = '2.7.6'
45+
ext['hdrhistogram.version'] = '2.1.10'
46+
ext['netty.version'] = '4.1.29.Final'
47+
ext['typesafe-config.version'] = '1.3.3'
48+
49+
sourceCompatibility = 1.8
50+
targetCompatibility = 1.8
51+
52+
project.version += project.hasProperty('versionSufix') ? project.property('versionSufix') : ''
8453

85-
project(':proteus-tracing-idl') {
86-
description = 'Netifi Proteus Tracing IDL'
87-
ext.artifactName = 'proteus-tracing-idl'
54+
repositories {
55+
mavenCentral()
56+
jcenter()
57+
maven { url 'http://repo.spring.io/libs-snapshot' }
58+
maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
59+
}
8860

89-
apply from: file('../gradle/java.gradle')
90-
}
61+
googleJavaFormat {
62+
toolVersion = '1.6'
63+
exclude '**/generated'
64+
}
65+
66+
dependencyManagement {
67+
imports {
68+
mavenBom "io.projectreactor:reactor-bom:${ext['reactor-bom.version']}"
69+
}
70+
71+
dependencies {
72+
dependencySet(group: 'com.google.protobuf', version: ext['protobuf.version']) {
73+
entry 'protobuf-java'
74+
entry 'protobuf-java-util'
75+
}
76+
77+
dependency "com.hubspot.jackson:jackson-datatype-protobuf:${ext['jackson-protobuf.version']}"
78+
dependency "com.fasterxml.jackson.core:jackson-databind:${ext['jackson.version']}"
79+
dependency "com.google.guava:guava:${ext['guava.version']}"
80+
dependency "javax.inject:javax.inject:1"
81+
dependency "javax.annotation:javax.annotation-api:1.2"
82+
83+
dependency "com.typesafe:config:${ext['typesafe-config.version']}"
84+
85+
dependencySet(group: 'org.apache.logging.log4j', version: ext['log4j.version']) {
86+
entry 'log4j-api'
87+
entry 'log4j-core'
88+
entry 'log4j-slf4j-impl'
89+
}
90+
91+
dependencySet(group: 'io.rsocket', version: ext['rsocket.version']) {
92+
entry 'rsocket-core'
93+
entry 'rsocket-transport-netty'
94+
entry 'rsocket-transport-local'
95+
}
96+
97+
dependencySet(group: 'io.rsocket.rpc', version: ext['rsocket-rpc.version']) {
98+
entry 'rsocket-rpc-core'
99+
entry 'rsocket-rpc-metrics-idl'
100+
entry 'rsocket-rpc-protobuf'
101+
entry 'rsocket-rpc-protobuf-idl'
102+
}
103+
104+
dependency "io.netty:netty-buffer:${ext['netty.version']}"
105+
106+
dependencySet(group: 'io.micrometer', version: ext['micrometer.version']) {
107+
entry 'micrometer-core'
108+
entry 'micrometer-registry-atlas'
109+
entry 'micrometer-registry-prometheus'
110+
}
111+
112+
dependency "io.opentracing:opentracing-api:${ext['opentracing.version']}"
113+
dependency "io.opentracing.brave:brave-opentracing:${ext['opentracing.brave.version']}"
114+
dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:${ext['zipkin.sender.version']}"
115+
116+
// TODO: Remove after JUnit5 migration
117+
// TEST DEPENDENCIES
118+
119+
dependency 'junit:junit:4.12'
120+
121+
dependencySet(group: 'org.junit.jupiter', version: ext['junit.version']) {
122+
entry 'junit-jupiter-api'
123+
entry 'junit-jupiter-engine'
124+
entry 'junit-jupiter-params'
125+
}
126+
127+
dependency "org.mockito:mockito-core:${ext['mockito.version']}"
128+
dependency "org.hamcrest:hamcrest-library:${ext['hamcrest.version']}"
129+
dependency "org.assertj:assertj-core:${ext['assertj.version']}"
130+
dependency "org.hdrhistogram:HdrHistogram:${ext['hdrhistogram.version']}"
131+
132+
dependencySet(group: 'org.junit.vintage', version: ext['junit.version']) {
133+
entry 'junit-vintage-engine'
134+
}
135+
136+
dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
137+
entry 'jmh-core'
138+
entry 'jmh-generator-annprocess'
139+
}
140+
}
141+
}
91142

92-
project(':proteus-vizceral-idl') {
93-
description = 'Netifi Proteus Vizceral IDL'
94-
ext.artifactName = 'proteus-vizceral-idl'
95143

96-
apply from: file('../gradle/java.gradle')
97-
}
144+
dependencies {
145+
compileOnly 'javax.inject:javax.inject'
146+
147+
testCompile 'junit:junit'
148+
testCompile 'javax.inject:javax.inject'
149+
testCompile 'io.projectreactor:reactor-test'
150+
testCompile "com.google.protobuf:protobuf-java"
151+
testCompile 'org.hdrhistogram:HdrHistogram'
152+
testCompile 'org.apache.logging.log4j:log4j-api'
153+
testCompile 'org.apache.logging.log4j:log4j-core'
154+
testCompile 'org.apache.logging.log4j:log4j-slf4j-impl'
155+
testCompile 'io.rsocket:rsocket-transport-netty'
156+
testCompile 'io.rsocket:rsocket-transport-local'
157+
testCompile 'org.mockito:mockito-core'
158+
}
159+
}

gradle/buildViaTravis.sh renamed to ci/travis.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ 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 clean build publish --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-
export ORG_GRADLE_PROJECT_releaseType=releaseCandidate
22-
./gradlew clean build publish --stacktrace
17+
./gradlew -PversionSufix=".BUILD-SNAPSHOT" clean build artifactoryPublish --stacktrace
2318
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
2419
# Master Branch
2520
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
@@ -34,5 +29,5 @@ else
3429
# Feature Branch
3530
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
3631
export ORG_GRADLE_PROJECT_releaseType=snapshot
37-
./gradlew clean build publish --stacktrace
32+
./gradlew clean -PversionSufix=".BUILD-SNAPSHOT" build artifactoryPublish --stacktrace
3833
fi

0 commit comments

Comments
 (0)