Cleanup files

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

Author: mbwhite

README.md

@@ -45,7 +45,23 @@ The following technical examples are in this repository. Please see the tutorial
 - **fabric-chaincode-example-sacc**  -  Contains an example java chaincode gradle project that includes sample chaincode and basic gradle build instructions.
 - **fabric-chaincode-example-sbe**  -  Contains an example java chaincode gradle project that includes state based endorsement
 
-  
+## 'dev' master branch builds
+
+These 'dev' drivers are built from the master branch only, and have a version format including the date for example `2.3.1.dev.20210303`.
+They are published to Artifactory. These can be accessed via the repository at 
+```
+    maven {
+        url "https://hyperledger.jfrog.io/hyperledger/fabric-maven"
+    }
+```
+
+They can be accessed in a build file like this
+
+```
+dependencies {
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.3.1.dev.+'
+ }
+```
 
 
 ## Building and testing

RELEASING.md

@@ -60,4 +60,17 @@ See the [Bump version to 2.2.1](https://github.com/hyperledger/fabric-chaincode-
 
 ## Interim Build Publishing
 
-tbc
+The nightly Azure Pipeline Builds will also publish the 'dev' drivers to Artifactory. These can be accessed via the repository at 
+```
+    maven {
+        url "https://hyperledger.jfrog.io/hyperledger/fabric-maven"
+    }
+```
+
+These 'dev' drivers are built from the master branch only, and have a version format including the date for example `2.3.1.dev.20210303`. They can be accessed in a build file like this
+
+```
+dependencies {
+    compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.3.1.dev.+'
+ }
+```

build.gradle

@@ -8,8 +8,16 @@ apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
 version = '2.3.1'
 
+
+// If the nightly property is set, then this is the scheduled master 
+// build - and we should publish this to artifactory
+// 
+// Use the .dev.<number> format to match Maven convention
 if (properties.containsKey('NIGHTLY')) {
     version = version + '.dev.' + getDate()
+    ext.nightly = true   // set property for use in subprojects
+} else {
+    ext.nightly = false
 }
 
 allprojects {
@@ -28,6 +36,7 @@ subprojects {
 
     group = 'org.hyperledger.fabric-chaincode-java'
     version = rootProject.version
+    
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -63,7 +72,7 @@ task printVersionName() {
     println rootProject.version
 }
 
-
+// Get the date in the reverse format for sorting
 def getDate() {
     def date = new Date()
     def formattedDate = date.format('yyyyMMdd')

ci/azure-pipelines.yml

@@ -207,7 +207,7 @@ stages:
 
               #
   - stage: Publish_tag_nightly
-    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
+    condition: and(succeeded(), eq(variables['Build.Reason'], 'Schedule'))  # only run on the scheduled builds
     jobs:
       - job: jar_publish
         steps:

fabric-chaincode-protos/build.gradle

@@ -142,8 +142,7 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-            if (properties.containsKey('NIGHTLY')) {
-                logger.info("++++++++++++++++++++++++++++++ Running Nightly")
+            if (nightly) {
                     repository(url: "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven") {
                     authentication(userName: project.findProperty('artifactoryUsername'), password: project.findProperty('artifactoryPassword'))
                 }
@@ -152,7 +151,6 @@ uploadArchives {
                     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'))
                 }
@@ -163,7 +161,7 @@ uploadArchives {
             }
 
             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

@@ -255,8 +255,7 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-            if (properties.containsKey('NIGHTLY')) {
-  
+            if (nightly) {
                 repository(url: "https://hyperledger-fabric.jfrog.io/artifactory/fabric-maven") {
                     authentication(userName: project.findProperty('artifactoryUsername'), password: project.findProperty('artifactoryPassword'))
                 }