rsocket
diff --git a/‎.travis.yml‎
Lines changed: 30 additions & 27 deletions b/‎.travis.yml‎
Lines changed: 30 additions & 27 deletions
diff --git a/‎artifactory.gradle‎
Lines changed: 1 addition & 1 deletion b/‎artifactory.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎build.gradle‎
Lines changed: 14 additions & 22 deletions b/‎build.gradle‎
Lines changed: 14 additions & 22 deletions
diff --git a/‎ci/install_protobuf.sh‎
Lines changed: 18 additions & 0 deletions b/‎ci/install_protobuf.sh‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎ci/travis.sh‎
Lines changed: 19 additions & 2 deletions b/‎ci/travis.sh‎
Lines changed: 19 additions & 2 deletions
diff --git a/‎dependencies-managment.gradle‎
Lines changed: 46 additions & 0 deletions b/‎dependencies-managment.gradle‎
Lines changed: 46 additions & 0 deletions
diff --git a/‎gradle.properties‎
Lines changed: 18 additions & 2 deletions b/‎gradle.properties‎
Lines changed: 18 additions & 2 deletions
diff --git a/‎gradle/wrapper/gradle-wrapper.jar‎
1.17 KB b/‎gradle/wrapper/gradle-wrapper.jar‎
1.17 KB
diff --git a/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 2 additions & 2 deletions b/‎gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎gradlew‎
Lines changed: 19 additions & 3 deletions b/‎gradlew‎
Lines changed: 19 additions & 3 deletions
@@ -7,13 +7,38 @@ jobs:
     os: linux
     jdk: oraclejdk8
     before_install:
-    - wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
-    - tar -xzvf protobuf-cpp-3.6.1.tar.gz
-    - pushd protobuf-3.6.1
-    - ./configure --disable-shared && make && sudo make install
+    - pushd $HOME
+    - ls
+    - ls ./protobuf-3.6.1
+    - bash ./build/rsocket/rsocket-rpc-java/ci/install_protobuf.sh
     - popd
+    - java -version
+    - protoc --version
     script: "./ci/travis.sh"
   - stage: build
+    language: cpp
+    os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    before_install:
+    - sudo rm -rf /Library/Java/JavaVirtualMachines/*
+    - curl -OLJ https://api.adoptopenjdk.net/v1/openjdk8/releases/x64_mac/latest/binary
+    - tar -xzf OpenJDK8_x64_Mac_jdk*.tar.gz
+    - sudo mkdir /Library/Java/JavaVirtualMachines/openjdk-8.jdk
+    - sudo mkdir /Library/Java/JavaVirtualMachines/openjdk-8.jdk/Contents
+    - sudo mv jdk8* /Library/Java/JavaVirtualMachines/openjdk-8.jdk/Contents/Home
+    - ls /Library/Java/JavaVirtualMachines/openjdk-8.jdk
+    - export JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk-8.jdk/Contents/Home
+    - brew uninstall --ignore-dependencies protobuf
+    - pushd $HOME
+    - ls
+    - ls ./protobuf-3.6.1
+    - bash ./build/rsocket/rsocket-rpc-java/ci/install_protobuf.sh
+    - popd
+    - java -version
+    - protoc --version
+    script: "./ci/travis.sh"
+  - stage: deploy
     language: cpp
     os: windows
     filter_secrets: false
@@ -32,35 +57,13 @@ jobs:
     - cmake --build . --config Release --target install
     - popd
     script: "./ci/travis.sh"
-  - stage: deploy
-    language: cpp
-    os: osx
-    osx_image: xcode11.2
-    jdk: openjdk8
-    compiler: clang
-    before_install:
-    - curl -OLJ https://api.adoptopenjdk.net/v1/openjdk8/releases/x64_mac/latest/binary
-    - tar -xzf OpenJDK8_x64_Mac_jdk*.tar.gz
-    - sudo mkdir /Library/Java/JavaVirtualMachines/openjdk-8.jdk
-    - sudo mkdir /Library/Java/JavaVirtualMachines/openjdk-8.jdk/Contents
-    - sudo mv jdk8* /Library/Java/JavaVirtualMachines/openjdk-8.jdk/Contents/Home
-    - sudo rm -rf /Library/Java/JavaVirtualMachines/openjdk-13*
-    - ls /Library/Java/JavaVirtualMachines/openjdk-8.jdk
-    - export JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk-8.jdk/Contents/Home
-    - java -version
-    - curl -O -L https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
-    - tar -xzf protobuf-cpp-3.6.1.tar.gz
-    - pushd protobuf-3.6.1
-    - ./autogen.sh
-    - ./configure --disable-shared && make && sudo make install
-    - popd
-    script: "./ci/travis.sh"
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 notifications:
   email: false
 cache:
   directories:
+  - "$HOME/protobuf-3.6.1/"
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
   - "$HOME/.m2"
 
@@ -23,7 +23,7 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
                     contextUrl = 'https://oss.jfrog.org'
 
                     repository {
-                        repoKey = version.contains('SNAPSHOT') ? 'oss-snapshot-local' : 'oss-release-local'
+                        repoKey = 'oss-snapshot-local'
 
                         // Credentials for oss.jfrog.org are a user's Bintray credentials
                         username = project.property('bintrayUser')
 
@@ -1,13 +1,13 @@
 plugins {
-    id 'com.gradle.build-scan' version '2.1'
     id 'com.google.osdetector' version '1.4.0'
     id 'com.github.sherter.google-java-format' version '0.8' apply false
-    id 'com.github.johnrengelman.shadow' version '4.0.2' apply false
-    id 'com.jfrog.artifactory' version '4.7.3' apply false
+    id 'com.github.johnrengelman.shadow' version '5.2.0' apply false
+    id 'com.jfrog.artifactory' version '4.11.0' apply false
     id 'com.jfrog.bintray' version '1.8.4' apply false
-    id 'me.champeau.gradle.jmh' version '0.4.8' apply false
+    id 'me.champeau.gradle.jmh' version '0.5.0' apply false
     id 'io.morethan.jmhreport' version '0.9.0' apply false
     id 'com.google.protobuf' version '0.8.10' apply false
+    id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
 }
 
 apply from: 'artifactory.gradle'
@@ -25,35 +25,27 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'com.github.sherter.google-java-format'
 
-    apply plugin: 'maven'
     apply plugin: 'maven-publish'
 
     apply plugin: 'com.jfrog.artifactory'
     apply plugin: 'com.jfrog.bintray'
 
+    apply from: "${project.rootDir}/dependencies-managment.gradle"
+
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    ext['reactor-bom.version'] = 'Dysprosium-RELEASE'
-    ext['rsocket.version'] = '1.0.0-RC5'
-    ext['graphql.version'] = '11.0'
-    ext['protobuf.version'] = '3.6.1'
-    ext['log4j.version'] = '2.12.1'
-    ext['slf4j.version'] = '1.7.29'
-    ext['junit.version'] = '5.4.0'
-    ext['mockito.version'] = '2.23.0'
-    ext['hamcrest.version'] = '1.3'
-    ext['jmh.version'] = '1.21'
-    ext['micrometer.version'] = '1.0.6'
-    ext['assertj.version'] = '3.11.1'
-    ext['opentracing.version'] = '0.31.0'
-    ext['opentracing.brave.version'] = '0.33.10'
-    ext['zipkin.sender.version'] = '2.8.0'
-    ext['hdrhistogram.version'] = '2.1.10'
+    ext {
+        if (project.hasProperty('versionSuffix')) {
+            project.version += project.getProperty('versionSuffix')
+        }
+    }
 
     repositories {
+        mavenLocal()
+        maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
         mavenCentral()
-        if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
+        if (version.endsWith('SNAPSHOT') || project.hasProperty('platformVersion')) {
             maven { url 'http://repo.spring.io/libs-snapshot' }
             maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
         }
 
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+DIR=./protobuf-3.6.1
+
+if [ ! -d "$DIR" ] || [ ! "$(ls -A $DIR)" ]; then
+  echo 'install protobuf from scratch'
+  curl -O -L https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
+  tar -xzvf protobuf-cpp-3.6.1.tar.gz
+  pushd protobuf-3.6.1 || exit
+  ./autogen.sh
+  ./configure --disable-shared && make && sudo make install
+  popd || exit
+else
+  echo 'install protobuf from cache'
+  pushd protobuf-3.6.1 || exit
+  sudo make install
+  popd || exit
+fi
@@ -4,16 +4,31 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
 
     echo -e "Building PR #$TRAVIS_PULL_REQUEST [$TRAVIS_PULL_REQUEST_SLUG/$TRAVIS_PULL_REQUEST_BRANCH => $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH]"
     ./gradlew \
-        -PvcProtobufLibs="/c/Program Files/protobuf/lib" -PvcProtobufInclude="/c/Program Files/protobuf/include" \
+        -PversionSuffix="-SNAPSHOT" \
+        -PvcProtobufLibs="/c/Program Files/protobuf/lib" \
+        -PvcProtobufInclude="/c/Program Files/protobuf/include" \
         build
 
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ] && [ "$bintrayUser" != "" ] && [ "$TRAVIS_BRANCH" == "master" ] ; then
+
+    echo -e "Building Master Snapshot $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER"
+    ./gradlew \
+        -PversionSuffix="-SNAPSHOT" \
+        -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" \
+        -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" \
+        -PvcProtobufLibs="/c/Program Files/protobuf/lib" -PvcProtobufInclude="/c/Program Files/protobuf/include" \
+        -PbuildNumber="$TRAVIS_BUILD_NUMBER" \
+        build artifactoryPublish --stacktrace
+
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ] && [ "$bintrayUser" != "" ] ; then
 
-    echo -e "Building Snapshot $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH"
+    echo -e "Building Branch Snapshot $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER"
     ./gradlew \
+        -PversionSuffix="-${TRAVIS_BRANCH//\//-}-SNAPSHOT" \
         -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" \
         -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" \
         -PvcProtobufLibs="/c/Program Files/protobuf/lib" -PvcProtobufInclude="/c/Program Files/protobuf/include" \
+        -PbuildNumber="$TRAVIS_BUILD_NUMBER" \
         build artifactoryPublish --stacktrace
 
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ] && [ "$bintrayUser" != "" ] ; then
@@ -24,12 +39,14 @@ elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ] && [ "$bin
         -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" \
         -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" \
         -PvcProtobufLibs="/c/Program Files/protobuf/lib" -PvcProtobufInclude="/c/Program Files/protobuf/include" \
+        -PbuildNumber="$TRAVIS_BUILD_NUMBER" \
         build bintrayUpload --stacktrace
 
 else
 
     echo -e "Building $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH"
     ./gradlew \
+        -PversionSuffix="-SNAPSHOT" \
         -PvcProtobufLibs="/c/Program Files/protobuf/lib" -PvcProtobufInclude="/c/Program Files/protobuf/include" \
         build
 
 
@@ -0,0 +1,46 @@
+apply plugin: 'io.spring.dependency-management'
+
+dependencyManagement {
+    imports {
+        mavenBom "io.projectreactor:reactor-bom:$reactorBomVersion"
+        mavenBom "io.rsocket:rsocket-bom:$rsocketVersion"
+        mavenBom "org.junit:junit-bom:$junitVersion"
+        mavenBom "com.google.protobuf:protobuf-bom:$protobufVersion"
+    }
+
+    dependencies {
+        dependency "javax.inject:javax.inject:1"
+        dependency "javax.annotation:javax.annotation-api:1.2"
+
+        dependency "com.google.protobuf:protoc:3.6.1"
+
+        dependencySet(group: 'org.apache.logging.log4j', version: log4jVersion) {
+            entry "log4j-api"
+            entry "log4j-core"
+            entry "log4j-slf4j-impl"
+        }
+
+        dependency "org.slf4j:slf4j-api:$slf4jVersion"
+        dependency "org.slf4j:slf4j-simple:$slf4jVersion"
+
+        dependency "io.micrometer:micrometer-core:$micrometerVersion"
+        dependency "io.opentracing:opentracing-api:$opentracingVersion"
+        dependency "io.opentracing.brave:brave-opentracing:$opentracingBraveVersion"
+        dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:$zipkinSenderVersion"
+
+        // TODO: Remove after JUnit5 migration
+        // TEST DEPENDENCIES
+
+        dependency 'junit:junit:4.12'
+
+        dependency "org.mockito:mockito-core:$mockitoVersion"
+        dependency "org.hamcrest:hamcrest-library:$hamcrestVersion"
+        dependency "org.assertj:assertj-core:$assertjVersion"
+        dependency "org.hdrhistogram:HdrHistogram:$hdrhistogramVersion"
+
+        dependencySet(group: 'org.openjdk.jmh', version: jmhVersion) {
+            entry 'jmh-core'
+            entry 'jmh-generator-annprocess'
+        }
+    }
+}
@@ -1,3 +1,19 @@
-
 group=io.rsocket.rpc
-version=0.2.20-SNAPSHOT
+version=0.3.0
+
+reactorBomVersion=Dysprosium-RELEASE
+rsocketVersion=1.0.0-RC6-SNAPSHOT
+graphqlVersion=11.0
+protobufVersion=3.7.1
+log4jVersion=2.12.1
+slf4jVersion=1.7.29
+junitVersion=5.4.0
+mockitoVersion=2.23.0
+hamcrestVersion=1.3
+jmhVersion=1.21
+micrometerVersion=1.0.6
+assertjVersion=3.11.1
+opentracingVersion=0.31.0
+opentracingBraveVersion=0.33.10
+zipkinSenderVersion=2.8.0
+hdrhistogramVersion=2.1.10
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`