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

Commit bf73012

Browse files
committed
Merge branch 'release/0.9.0'
2 parents c2f1ec4 + d297913 commit bf73012

File tree

105 files changed

+3802
-4094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3802
-4094
lines changed

.travis.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,12 @@ matrix:
44
- os: linux
55
jdk: oraclejdk8
66
language: generic
7-
before_install:
8-
- wget https://github.com/google/protobuf/releases/download/v3.6.0/protobuf-cpp-3.6.0.tar.gz
9-
- tar -xzvf protobuf-cpp-3.6.0.tar.gz
10-
- pushd protobuf-3.6.0 && ./configure --disable-shared && make && sudo make install
11-
&& popd
127
script: gradle/buildViaTravis-linux.sh
138
- os: osx
149
osx_image: xcode9.4
1510
language: generic
1611
env:
1712
- HOMEBREW_TEMP="/tmp"
18-
- LDFLAGS="/usr/local/lib/libprotobuf.a /usr/local/lib/libprotoc.a"
19-
before_install:
20-
- brew update
21-
- EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'"
22-
brew edit protobuf
23-
- brew install protobuf
2413
script: gradle/buildViaTravis.sh
2514
before_cache:
2615
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,7 @@
44

55

66
## Build from Source
7-
1. Building proteus-java requires installation of the [Protobuf](https://github.com/google/protobuf) compiler. Proteus requires Protobuf 3.4.x or higher.
8-
9-
For Mac users you can easily install the Protobuf compiler using Homebrew:
10-
11-
$ brew install protobuf
12-
13-
For other operating systems you can install the Protobuf compiler using the pre-built packages hosted on the [Protobuf Releases](https://github.com/google/protobuf/releases) page.
14-
15-
2. Run the following Gradle command to build the project:
7+
1. Run the following Gradle command to build the project:
168

179
$ ./gradlew clean build
1810

build.gradle

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,95 +10,95 @@ buildscript {
1010
plugins {
1111
id 'com.gradle.build-scan' version '1.15.1' // declare before any other plugin
1212
id 'com.google.osdetector' version '1.4.0'
13-
id 'com.github.sherter.google-java-format' version '0.6' apply false
13+
id 'com.github.sherter.google-java-format' version '0.7.1' apply false
1414
id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
1515
id 'me.champeau.gradle.jmh' version '0.4.4' apply false
1616
id 'io.morethan.jmhreport' version '0.6.2.1' apply false
1717
}
1818

1919
buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
2020

21-
project(':auth') {
21+
project(':proteus-auth') {
2222
description = 'Netifi Proteus Authentication Utilities'
23-
ext.artifactName = 'auth'
23+
ext.artifactName = 'proteus-auth'
2424

2525
apply from: file('../gradle/java.gradle')
2626
}
2727

28-
project(':access-key-info-idl') {
29-
description = 'Netifi Access Key IDL'
30-
ext.artifactName = 'access-key-info-idl'
28+
project(':proteus-access-key-info-idl') {
29+
description = 'Netifi Proteus Access Key IDL'
30+
ext.artifactName = 'proteus-access-key-info-idl'
3131

3232
apply from: file('../gradle/java.gradle')
3333
}
3434

35-
project(':broker-info-idl') {
36-
description = 'Netifi Broker Info IDL'
37-
ext.artifactName = 'broker-info-idl'
35+
project(':proteus-broker-info-idl') {
36+
description = 'Netifi Proteus Broker Info IDL'
37+
ext.artifactName = 'proteus-broker-info-idl'
3838

3939
apply from: file('../gradle/java.gradle')
4040
}
4141

42-
project(':broker-mgmt-idl') {
43-
description = 'Netifi Broker Management IDL'
44-
ext.artifactName = 'broker-mgmt-idl'
42+
project(':proteus-broker-mgmt-idl') {
43+
description = 'Netifi Proteus Broker Management IDL'
44+
ext.artifactName = 'proteus-broker-mgmt-idl'
4545

4646
apply from: file('../gradle/java.gradle')
4747
}
4848

49-
project(':frames') {
49+
project(':proteus-frames') {
5050
description = 'Netifi Proteus Frames'
51-
ext.artifactName = 'frames'
51+
ext.artifactName = 'proteus-frames'
5252

5353
apply from: file('../gradle/java.gradle')
5454
}
5555

56-
project(':client') {
56+
project(':proteus-client') {
5757
description = 'Netifi Proteus Client'
58-
ext.artifactName = 'client'
58+
ext.artifactName = 'proteus-client'
5959

6060
apply from: file('../gradle/java.gradle')
6161
}
6262

63-
project(':metrics-micrometer') {
63+
project(':proteus-metrics-micrometer') {
6464
description = 'Netifi Proteus Micrometer Support'
65-
ext.artifactName = 'metrics-micrometer'
65+
ext.artifactName = 'proteus-metrics-micrometer'
6666

6767
apply from: file('../gradle/java.gradle')
6868
}
6969

70-
project(':metrics-prometheus') {
70+
project(':proteus-metrics-prometheus') {
7171
description = 'Netifi Proteus Prometheus Integration'
72-
ext.artifactName = 'metrics-prometheus'
72+
ext.artifactName = 'proteus-metrics-prometheus'
7373

7474
apply from: file('../gradle/java.gradle')
7575
}
7676

77-
project(':tracing-openzipkin') {
77+
project(':proteus-tracing-openzipkin') {
7878
description = 'Netifi Proteus Openzipkin Integration'
79-
ext.artifactName = 'tracing-openzipkin'
79+
ext.artifactName = 'proteus-tracing-openzipkin'
8080

8181
apply from: file('../gradle/java.gradle')
8282
}
8383

8484

85-
project(':tracing-idl') {
85+
project(':proteus-tracing-idl') {
8686
description = 'Netifi Proteus Tracing IDL'
87-
ext.artifactName = 'tracing-idl'
87+
ext.artifactName = 'proteus-tracing-idl'
8888

8989
apply from: file('../gradle/java.gradle')
9090
}
9191

92-
project(':viz-idl') {
92+
project(':proteus-vizceral-idl') {
9393
description = 'Netifi Proteus Vizceral IDL'
94-
ext.artifactName = 'viz-idl'
94+
ext.artifactName = 'proteus-vizceral-idl'
9595

9696
apply from: file('../gradle/java.gradle')
9797
}
9898

99-
project(':vizceral') {
99+
project(':proteus-vizceral') {
100100
description = 'Netifi Proteus Vizceral Service'
101-
ext.artifactName = 'vizceral'
101+
ext.artifactName = 'proteus-vizceral'
102102

103103
apply from: file('../gradle/java.gradle')
104104
}

client/src/main/java/io/netifi/proteus/ProteusBrokerService.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.netifi.proteus
2-
version=0.8.10
2+
version=0.9.0

gradle/wrapper/gradle-wrapper.jar

-318 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

access-key-info-idl/src/main/proto/proteus/accesskey_info.proto renamed to proteus-access-key-info-idl/src/main/proto/proteus/accesskey_info.proto

File renamed without changes.

0 commit comments

Comments
 (0)