Add in publishing of the nightly master branch drivers

Signed-off-by: Matthew B White <[email protected]>

Author: mbwhite

.gitignore

@@ -8,6 +8,8 @@
 /build/
 build/*
 
+.env
+
 .gradle
 /build/
 out/

RELEASING.md

@@ -57,3 +57,7 @@ When the release has completed and the _Staging Repositories_ list is empty, the
 - Update test, sample, and docs files to match the new version
 
 See the [Bump version to 2.2.1](https://github.com/hyperledger/fabric-chaincode-java/pull/127) pull request for an example. It should include almost all the files changed to prepare for the release, except for the release notes and changelog which do not need updating.
+
+## Interim Build Publishing
+
+tbc

build.gradle

@@ -7,6 +7,11 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
 version = '2.3.1'
+
+if (properties.containsKey('NIGHTLY')) {
+    version = version + '.dev.' + getDate()
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -57,3 +62,10 @@ subprojects {
 task printVersionName() {
     println rootProject.version
 }
+
+
+def getDate() {
+    def date = new Date()
+    def formattedDate = date.format('yyyyMMdd')
+    return formattedDate
+}

ci/azure-pipelines.yml

@@ -14,7 +14,6 @@ schedules:
     branches:
       include:
         - master
-    always: true
 
 trigger:
   branches:
@@ -205,3 +204,23 @@ stages:
               KEYRING_FILE: $(keyring.secureFilePath)
               OSSRH_USER: $(OSSRH-User)
               OSSRH_PASSWORD: $(OSSRH-Password)
+
+              #
+  - stage: Publish_tag_nightly
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
+    jobs:
+      - job: jar_publish
+        steps:
+          - template: templates/build-data.yml
+          - task: DownloadSecureFile@1
+            name: keyring
+            inputs:
+              secureFile: secring.gpg
+          - script: |
+              ./gradlew -PNIGHTLY=true -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=${KEYRING_FILE} -PartifactoryUsername=${ARTIFACTORY_USER} -PartifactoryhPassword=${ARTIFACTORY_PASSWORD} uploadArchives
+            env:
+              SIGNING_ID: $(JAR-Signing-Id)
+              SIGNING_PASSWORD: $(JAR-Signing-Password)              
+              KEYRING_FILE: $(keyring.secureFilePath)
+              ARTIFACTORY_USER: $(ARTIFACTORY-User)
+              ARTIFACTORY_PASSWORD: $(ARTIFACTORY-Password)

fabric-chaincode-protos/build.gradle

@@ -142,16 +142,28 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
-            }
+            if (properties.containsKey('NIGHTLY')) {
+                logger.info("++++++++++++++++++++++++++++++ Running Nightly")
+                    repository(url: "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven") {
+                    authentication(userName: project.findProperty('artifactoryUsername'), password: project.findProperty('artifactoryPassword'))
+                }
+
+                snapshotRepository(url: "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven") {
+                    authentication(userName: project.findProperty('artifactoryUsername'), password: project.findProperty('artifactoryPassword'))
+                }
+            } else {
+                logger.info("Running Release")
+                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                    authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
+                }
 
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
+                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+                    authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
+                }
             }
 
             pom.project {
-                name 'JavaChaincodeProtobuf'
+                name '++++++++++++++++++++++++++++++++++++++JavaChaincodeProtobuf'
                 packaging 'jar'
                 description 'Hyperldger Fabric Java chaincode protobuf files'
                 url 'http://www.hyperledger.org/'

fabric-chaincode-shim/build.gradle

@@ -35,8 +35,6 @@ checkstyleTest {
     source ='src/test/java'
 }
 
-
-
 check.dependsOn dependencyCheckAnalyze
 
 tasks.withType(org.gradle.api.tasks.testing.Test) {
@@ -257,12 +255,23 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
-            }
+            if (properties.containsKey('NIGHTLY')) {
+  
+                repository(url: "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven") {
+                    authentication(userName: project.findProperty('artifactoryUsername'), password: project.findProperty('artifactoryPassword'))
+                }
 
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
+                snapshotRepository(url: "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven") {
+                    authentication(userName: project.findProperty('artifactoryUsername'), password: project.findProperty('artifactoryPassword'))
+                }
+            } else {
+                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+                    authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
+                }
+
+                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+                    authentication(userName: project.findProperty('ossrhUsername'), password: project.findProperty('ossrhPassword'))
+                }
             }
 
             pom.project {