merge from release/1.6.0

Author: kbahr

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 Netifi Inc.
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -7,6 +7,16 @@
 1. Run the following Gradle command to build the project:
 
         $ ./gradlew clean build
+        
+## Updating Dependencies
+The proteus-java build uses [Dependencies Lock strategy](https://docs.gradle.org/current/userguide/dependency_locking.html)
+Which keeps all dependencies versions snapshot in one file. Such a strategy allows avoiding caveats with libs versions and prevent accidental introduction of new dependencies in the project.
+
+In order to update the dependencies versions, it is required to run the project build with 
+additional command as in the following sample
+
+    $ ./gradlew clean build --write-locks
+            
 
 ## Documentation
 

build.gradle

@@ -1,4 +1,8 @@
 buildscript {
+    configurations.classpath {
+        resolutionStrategy.activateDependencyLocking()
+    }
+    
     repositories {
         maven {
             url "https://plugins.gradle.org/m2/"
@@ -11,49 +15,41 @@ buildscript {
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '1.16' // declare before any other plugin
+    id 'com.gradle.build-scan' version '2.0.2' // declare before any other plugin
     id 'com.google.osdetector' version '1.4.0'
-    id 'com.github.sherter.google-java-format' version '0.7.1' apply false
-    id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
+    id "com.github.hierynomus.license" version '0.15.0'
+    id 'com.github.sherter.google-java-format' version '0.8' apply false
     id 'me.champeau.gradle.jmh' version '0.4.7' apply false
     id 'io.morethan.jmhreport' version '0.6.2.1' apply false
-    id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
-    id 'com.google.protobuf' version '0.8.5' apply false
+    id 'io.spring.dependency-management' version '1.0.7.RELEASE' apply false
+    id 'com.google.protobuf' version '0.8.8' apply false
+}
+
+//buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
+buildScan {
+    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+    termsOfServiceAgree = 'yes'
 }
 
-buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
+
+allprojects {
+
+    dependencyLocking {
+        lockAllConfigurations()
+    }
+
+}
 
 subprojects {
-    apply plugin: 'io.spring.dependency-management'
+    apply from: "../dependency-management.gradle"
     apply plugin: 'com.jfrog.bintray'
-    apply plugin: "com.jfrog.artifactory"
+    apply plugin: 'com.jfrog.artifactory'
     apply plugin: 'java'
     apply plugin: 'idea'
     apply plugin: 'com.github.sherter.google-java-format'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
-    
-    ext['reactor-bom.version'] = 'Californium-SR1'
-    ext['rsocket.version'] = '0.11.15'
-    ext['rsocket-rpc.version'] = '0.2.12'
-
-    ext['jackson.version'] = '2.9.7'
-    ext['jackson-protobuf.version'] = '0.9.10-jackson2.9-proto3'
-    ext['guava.version'] = '22.0'
-    ext['protobuf.version'] = '3.6.1'
-    ext['log4j.version'] = '2.9.0'
-    ext['junit.version'] = '5.1.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.31.2'
-    ext['zipkin.sender.version'] = '2.7.6'
-    ext['hdrhistogram.version'] = '2.1.10'
-    ext['netty.version'] = '4.1.29.Final'
-    ext['typesafe-config.version'] = '1.3.3'
+    apply plugin: 'license'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -62,6 +58,13 @@ subprojects {
 
     repositories {
         jcenter()
+        maven {
+            url = 'https://artifactory.netifiinc.com/artifactory/libs-snapshot-local'
+            credentials {
+                username = project.findProperty('netifiArtifactoryUsername') ?: System.getenv('NETIFI_ARTIFACTORY_USERNAME')
+                password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
+            }
+        }
         maven { url 'http://repo.spring.io/libs-snapshot' }
         maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
         maven { url 'https://oss.jfrog.org/oss-release-local' }
@@ -73,102 +76,6 @@ subprojects {
         toolVersion = '1.6'
         exclude '**/generated'
     }
-    
-    dependencyManagement {
-        imports {
-            mavenBom "io.projectreactor:reactor-bom:${ext['reactor-bom.version']}"
-        }
-
-        dependencies {
-            dependencySet(group: 'com.google.protobuf', version: ext['protobuf.version']) {
-                entry 'protoc'
-                entry 'protobuf-java'
-                entry 'protobuf-java-util'
-            }
-
-            dependency "com.hubspot.jackson:jackson-datatype-protobuf:${ext['jackson-protobuf.version']}"
-            dependency "com.fasterxml.jackson.core:jackson-databind:${ext['jackson.version']}"
-            dependency "com.google.guava:guava:${ext['guava.version']}"
-            dependency "javax.inject:javax.inject:1"
-            dependency "javax.annotation:javax.annotation-api:1.2"
-
-            dependency "com.typesafe:config:${ext['typesafe-config.version']}"
-
-            dependencySet(group: 'org.apache.logging.log4j', version: ext['log4j.version']) {
-                entry 'log4j-api'
-                entry 'log4j-core'
-                entry 'log4j-slf4j-impl'
-            }
-
-            dependencySet(group: 'io.rsocket', version: ext['rsocket.version']) {
-                entry 'rsocket-core'
-                entry 'rsocket-transport-netty'
-                entry 'rsocket-transport-local'
-            }
-
-            dependencySet(group: 'io.rsocket.rpc', version: ext['rsocket-rpc.version']) {
-                entry 'rsocket-rpc-core'
-                entry 'rsocket-rpc-metrics-idl'
-                entry 'rsocket-rpc-protobuf'
-                entry 'rsocket-rpc-protobuf-idl'
-            }
-
-            dependency "io.netty:netty-buffer:${ext['netty.version']}"
-
-            dependencySet(group: 'io.micrometer', version: ext['micrometer.version']) {
-                entry 'micrometer-core'
-                entry 'micrometer-registry-atlas'
-                entry 'micrometer-registry-prometheus'
-            }
-
-            dependency "io.opentracing:opentracing-api:${ext['opentracing.version']}"
-            dependency "io.opentracing.brave:brave-opentracing:${ext['opentracing.brave.version']}"
-            dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:${ext['zipkin.sender.version']}"
-
-            // TODO: Remove after JUnit5 migration
-            // TEST DEPENDENCIES
-
-            dependency 'junit:junit:4.12'
-
-            dependencySet(group: 'org.junit.jupiter', version: ext['junit.version']) {
-                entry 'junit-jupiter-api'
-                entry 'junit-jupiter-engine'
-                entry 'junit-jupiter-params'
-            }
-
-            dependency "org.mockito:mockito-core:${ext['mockito.version']}"
-            dependency "org.hamcrest:hamcrest-library:${ext['hamcrest.version']}"
-            dependency "org.assertj:assertj-core:${ext['assertj.version']}"
-            dependency "org.hdrhistogram:HdrHistogram:${ext['hdrhistogram.version']}"
-
-            dependencySet(group: 'org.junit.vintage', version: ext['junit.version']) {
-                entry 'junit-vintage-engine'
-            }
-
-
-            dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
-                entry 'jmh-core'
-                entry 'jmh-generator-annprocess'
-            }
-        }
-    }
-
-
-    dependencies {
-        compileOnly 'javax.inject:javax.inject'
-
-        testCompile 'junit:junit'
-        testCompile 'javax.inject:javax.inject'
-        testCompile 'io.projectreactor:reactor-test'
-        testCompile "com.google.protobuf:protobuf-java"
-        testCompile 'org.hdrhistogram:HdrHistogram'
-        testCompile 'org.apache.logging.log4j:log4j-api'
-        testCompile 'org.apache.logging.log4j:log4j-core'
-        testCompile 'org.apache.logging.log4j:log4j-slf4j-impl'
-        testCompile 'io.rsocket:rsocket-transport-netty'
-        testCompile 'io.rsocket:rsocket-transport-local'
-        testCompile 'org.mockito:mockito-core'
-    }
 
     // Build Source Jars
     def sourcesJarMap = [name: 'sourcesJar', type: Jar, dependsOn: classes]
@@ -200,6 +107,13 @@ subprojects {
             }
         }
     }
+
+    license {
+        header rootProject.file('resources/HEADER')
+        strictCheck true
+        excludes(["**/*.xml", "**/*.json"])
+    }
+    license.mapping('java', 'SLASHSTAR_STYLE')
 }
 
 apply from: "artifactory.gradle"

ci/travis.sh

@@ -9,29 +9,29 @@ echo -e "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
     # Pull Request
     echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
-    ./gradlew clean build --stacktrace
+    ./gradlew clean build --stacktrace --refresh-dependencies
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_TAG" == "" ]; then
     # Develop Branch
     echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
     export ORG_GRADLE_PROJECT_releaseType=snapshot
-    ./gradlew -PversionSuffix=".BUILD-SNAPSHOT" clean build artifactoryPublish --stacktrace
+    ./gradlew -PversionSuffix=".BUILD-SNAPSHOT" clean build artifactoryPublish --stacktrace --refresh-dependencies
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
     # Release Branch
     echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
-    ./gradlew -PversionSuffix="-RC" clean build artifactoryPublish --stacktrace
+    ./gradlew -PversionSuffix="-RC" clean build artifactoryPublish --stacktrace --refresh-dependencies
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
     # Master Branch
     echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
     export ORG_GRADLE_PROJECT_releaseType=release
-    ./gradlew clean build --stacktrace
+    ./gradlew clean build --stacktrace --refresh-dependencies
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
     # Tag
     echo -e 'Build Tag for Release => Tag ['$TRAVIS_TAG']'
     export ORG_GRADLE_PROJECT_releaseType=release
-    ./gradlew clean build bintrayUpload --stacktrace
+    ./gradlew clean build bintrayUpload --stacktrace --refresh-dependencies
 else
     # Feature Branch
     echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
     export ORG_GRADLE_PROJECT_releaseType=snapshot
-    ./gradlew clean -PversionSuffix=".BUILD-SNAPSHOT" build artifactoryPublish --stacktrace
+    ./gradlew clean -PversionSuffix=".BUILD-SNAPSHOT" build artifactoryPublish --stacktrace --refresh-dependencies
 fi

dependency-management.gradle

@@ -0,0 +1,14 @@
+apply plugin: 'io.spring.dependency-management'
+
+ext['slf4j.version'] = '1.7.25'
+ext['proteus-common-dependencies.version'] = 'Andromeda-BUILD-SNAPSHOT'
+
+dependencyManagement {
+  imports {
+    mavenBom "io.netifi.proteus:proteus-common-dependencies:${ext['proteus-common-dependencies.version']}"
+  }
+
+  dependencies {
+    dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"
+  }
+}

gradle.properties

@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=1.5.5
+version=1.6.0

gradle/dependency-locks/buildscript-classpath.lockfile

@@ -0,0 +1,99 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+aopalliance:aopalliance:1.0
+backport-util-concurrent:backport-util-concurrent:3.1
+classworlds:classworlds:1.1-alpha-2
+com.fasterxml.jackson.core:jackson-annotations:2.9.0
+com.fasterxml.jackson.core:jackson-core:2.9.5
+com.fasterxml.jackson.core:jackson-databind:2.9.5
+com.github.hierynomus.license:com.github.hierynomus.license.gradle.plugin:0.15.0
+com.github.sherter.google-java-format:com.github.sherter.google-java-format.gradle.plugin:0.8
+com.google.gradle:osdetector-gradle-plugin:1.4.0
+com.google.guava:guava:18.0
+com.google.osdetector:com.google.osdetector.gradle.plugin:1.4.0
+com.google.protobuf:com.google.protobuf.gradle.plugin:0.8.8
+com.gradle.build-scan:com.gradle.build-scan.gradle.plugin:2.0.2
+com.gradle:build-scan-plugin:2.0.2
+com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4
+com.mycila.xmltool:xmltool:3.3
+com.mycila:license-maven-plugin:3.0
+com.mycila:mycila-xmltool:4.4.ga
+com.thoughtworks.xstream:xstream:1.4.10
+commons-beanutils:commons-beanutils:1.8.0
+commons-codec:commons-codec:1.9
+commons-collections:commons-collections:3.2.1
+commons-io:commons-io:2.2
+commons-lang:commons-lang:2.6
+commons-logging:commons-logging:1.2
+gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8
+gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.4.0
+gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.8
+gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0
+gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.6.2.1
+io.morethan.jmhreport:io.morethan.jmhreport.gradle.plugin:0.6.2.1
+io.spring.dependency-management:io.spring.dependency-management.gradle.plugin:1.0.7.RELEASE
+io.spring.gradle:dependency-management-plugin:1.0.7.RELEASE
+javax.annotation:jsr250-api:1.0
+javax.enterprise:cdi-api:1.0
+javax.inject:javax.inject:1
+junit:junit:3.8.1
+kr.motd.maven:os-maven-plugin:1.4.0.Final
+me.champeau.gradle.jmh:me.champeau.gradle.jmh.gradle.plugin:0.4.7
+me.champeau.gradle:jmh-gradle-plugin:0.4.7
+nekohtml:nekohtml:1.9.6.2
+nekohtml:xercesMinimal:1.9.6.2
+net.sf.ezmorph:ezmorph:1.0.6
+net.sf.jopt-simple:jopt-simple:4.6
+net.sf.json-lib:json-lib:2.3
+net.sourceforge.nekohtml:nekohtml:1.9.16
+org.apache.ant:ant-launcher:1.8.0
+org.apache.ant:ant:1.8.0
+org.apache.commons:commons-compress:1.16
+org.apache.commons:commons-math3:3.2
+org.apache.commons:commons-pool2:2.2
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.5
+org.apache.ivy:ivy:2.2.0
+org.apache.maven.wagon:wagon-file:1.0-beta-6
+org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6
+org.apache.maven.wagon:wagon-http-shared:1.0-beta-6
+org.apache.maven.wagon:wagon-provider-api:1.0-beta-6
+org.apache.maven:maven-ant-tasks:2.1.3
+org.apache.maven:maven-artifact-manager:2.2.1
+org.apache.maven:maven-artifact:3.2.1
+org.apache.maven:maven-error-diagnostics:2.2.1
+org.apache.maven:maven-model:3.2.1
+org.apache.maven:maven-plugin-api:3.2.1
+org.apache.maven:maven-plugin-registry:2.2.1
+org.apache.maven:maven-profile:2.2.1
+org.apache.maven:maven-project:2.2.1
+org.apache.maven:maven-repository-metadata:2.2.1
+org.apache.maven:maven-settings-builder:3.0.4
+org.apache.maven:maven-settings:3.0.4
+org.codehaus.groovy.modules.http-builder:http-builder:0.7.2
+org.codehaus.groovy:groovy-all:2.4.12
+org.codehaus.plexus:plexus-classworlds:2.4
+org.codehaus.plexus:plexus-component-annotations:1.5.5
+org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
+org.codehaus.plexus:plexus-interpolation:1.14
+org.codehaus.plexus:plexus-utils:3.0.17
+org.eclipse.sisu:org.eclipse.sisu.inject:0.0.0.M5
+org.eclipse.sisu:org.eclipse.sisu.plexus:0.0.0.M5
+org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3
+org.jetbrains:annotations:13.0
+org.jfrog.buildinfo:build-info-api:2.12.1
+org.jfrog.buildinfo:build-info-client:2.12.1
+org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1
+org.jfrog.buildinfo:build-info-extractor:2.12.1
+org.objenesis:objenesis:2.6
+org.openjdk.jmh:jmh-core:1.21
+org.sonatype.plexus:plexus-cipher:1.4
+org.sonatype.plexus:plexus-sec-dispatcher:1.3
+org.sonatype.sisu:sisu-guice:3.1.0
+org.springframework:spring-asm:3.1.3.RELEASE
+org.springframework:spring-core:3.1.3.RELEASE
+xerces:xercesImpl:2.9.1
+xml-resolver:xml-resolver:1.2
+xmlpull:xmlpull:1.1.3.1
+xpp3:xpp3_min:1.1.4c

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip