fixes build number

Signed-off-by: Oleh Dokuka <shadowgun@i.ua>

Author: OlegDokuka

artifactory.gradle

@@ -19,6 +19,7 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
     subprojects {
         plugins.withId('com.jfrog.artifactory') {
             artifactory {
+                contextUrl = 'https://oss.jfrog.org'
                 publish {
                     contextUrl = 'https://oss.jfrog.org'
 
@@ -33,9 +34,6 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
                     defaults {
                         publications('maven')
                     }
-                    if (project.hasProperty('buildNumber')) {
-                        clientConfig.info.setBuildNumber('' + project.property('buildNumber'))
-                    }
                 }
             }
         }

build.gradle

@@ -2,7 +2,7 @@ plugins {
     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 '5.2.0' apply false
-    id 'com.jfrog.artifactory' version '4.11.0' apply false
+    id 'com.jfrog.artifactory' version '4.12.0' apply false
     id 'com.jfrog.bintray' version '1.8.4' apply false
     id 'me.champeau.gradle.jmh' version '0.5.0' apply false
     id 'io.morethan.jmhreport' version '0.9.0' apply false

ci/travis.sh

@@ -17,29 +17,32 @@ 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" \
+        -PbuildInfo.build.number="$TRAVIS_BUILD_NUMBER" \
+        -PbuildInfo.build.timestamp="$(git show -s --format=%ct HEAD)000" \
         build artifactoryPublish --stacktrace
 
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ] && [ "$bintrayUser" != "" ] ; then
 
-    echo -e "Building Branch Snapshot $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER"
+    echo -e "Building Branch Snapshot $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/$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" \
+        -PbuildInfo.build.number="$TRAVIS_BUILD_NUMBER" \
+        -PbuildInfo.build.timestamp="$(git show -s --format=%ct HEAD)000" \
         build artifactoryPublish --stacktrace
 
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ] && [ "$bintrayUser" != "" ] ; then
 
     echo -e "Building Tag $TRAVIS_REPO_SLUG/$TRAVIS_TAG"
     ./gradlew \
-        -Pversion="$TRAVIS_TAG" -Pstage="$TRAVIS_BUILD_STAGE_NAME" -PbuildNumber="$TRAVIS_BUILD_NUMBER" \
+        -Pversion="$TRAVIS_TAG" -Pstage="$TRAVIS_BUILD_STAGE_NAME" \
         -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" \
         -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" \
         -PvcProtobufLibs="/c/Program Files/protobuf/lib" -PvcProtobufInclude="/c/Program Files/protobuf/include" \
-        -PbuildNumber="$TRAVIS_BUILD_NUMBER" \
+        -PbuildInfo.build.number="$TRAVIS_BUILD_NUMBER" \
+        -PbuildInfo.build.timestamp="$(git show -s --format=%ct HEAD)000" \
         build bintrayUpload --stacktrace
 
 else