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

Commit 90e1057

Browse files
kbahrkbahr
committed
Merge branch 'release/1.5.0'
2 parents b3b014d + ecdc0be commit 90e1057

File tree

19 files changed

+320
-340
lines changed

19 files changed

+320
-340
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
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:

‎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: 153 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,166 @@
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
11+
id 'com.google.protobuf' version '0.8.5' apply false
1712
}
1813

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'
14+
apply from: 'artifactory.gradle'
15+
apply from: 'bintray.gradle'
8016

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

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

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

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

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

96-
apply from: file('../gradle/java.gradle')
97-
}
151+
dependencies {
152+
compileOnly 'javax.inject:javax.inject'
153+
154+
testCompile 'junit:junit'
155+
testCompile 'javax.inject:javax.inject'
156+
testCompile 'io.projectreactor:reactor-test'
157+
testCompile "com.google.protobuf:protobuf-java"
158+
testCompile 'org.hdrhistogram:HdrHistogram'
159+
testCompile 'org.apache.logging.log4j:log4j-api'
160+
testCompile 'org.apache.logging.log4j:log4j-core'
161+
testCompile 'org.apache.logging.log4j:log4j-slf4j-impl'
162+
testCompile 'io.rsocket:rsocket-transport-netty'
163+
testCompile 'io.rsocket:rsocket-transport-local'
164+
testCompile 'org.mockito:mockito-core'
165+
}
166+
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +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 clean build publish --stacktrace
17+
./gradlew -PversionSuffix=".BUILD-SNAPSHOT" clean build artifactoryPublish --stacktrace
1818
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
1919
# Release Branch
2020
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
21-
export ORG_GRADLE_PROJECT_releaseType=releaseCandidate
22-
./gradlew clean build publish --stacktrace
21+
./gradlew -PversionSuffix="-RC" clean build artifactoryPublish --stacktrace
2322
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
2423
# Master Branch
2524
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
@@ -34,5 +33,5 @@ else
3433
# Feature Branch
3534
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
3635
export ORG_GRADLE_PROJECT_releaseType=snapshot
37-
./gradlew clean build publish --stacktrace
36+
./gradlew clean -PversionSuffix=".BUILD-SNAPSHOT" build artifactoryPublish --stacktrace
3837
fi

0 commit comments

Comments
 (0)