Merge pull request #172 from denyeart/master_to_main

Update "master" branch references to "main"

Author: denyeart

.github/settings.yml

@@ -7,7 +7,7 @@ repository:
   description: Hyperledger Fabric Contract and Chaincode implementation for Java
     https://wiki.hyperledger.org/display/fabric
   homepage: https://jira.hyperledger.org/issues/?jql=project+%3D+FAB+AND+component+%3D+fabric-chaincode-java
-  default_branch: master
+  default_branch: main
   has_downloads: true
   has_issues: false
   has_projects: false

CONTRIBUTING.md

@@ -28,7 +28,7 @@ Make sure you have the support of the Hyperledger Fabric community before invest
 
 We use our own forks and [Github Flow](https://guides.github.com/introduction/flow/index.html) to deliver changes to the code. Follow these steps to deliver your first pull request:
 
-1. [Fork the repository](https://guides.github.com/activities/forking/#fork) and create a new branch from `master`.
+1. [Fork the repository](https://guides.github.com/activities/forking/#fork) and create a new branch from `main`.
 2. If you've added code that should be tested, add tests!
 3. If you've added any new features or made breaking changes, update the documentation.
 4. Ensure all the tests pass.
@@ -42,11 +42,11 @@ Please to try to be consistent with the rest of the code and conform to checksty
 
 ## Code of Conduct Guidelines <a name="conduct"></a>
 
-See our [Code of Conduct Guidelines](../blob/master/CODE_OF_CONDUCT.md).
+See our [Code of Conduct Guidelines](../blob/main/CODE_OF_CONDUCT.md).
 
 ## Maintainers <a name="maintainers"></a>
 
-Should you have any questions or concerns, please reach out to one of the project's [Maintainers](../blob/master/MAINTAINERS.md).
+Should you have any questions or concerns, please reach out to one of the project's [Maintainers](../blob/main/MAINTAINERS.md).
 
 ## Hyperledger Fabric
 

MAINTAINERS.md

@@ -22,6 +22,6 @@ Retired Maintainers
 | Yacov Manevich            | yacovm           | yacovm         | [email protected]                   |
 
 
-Also: Please see the [Release Manager section](https://github.com/hyperledger/fabric/blob/master/MAINTAINERS.md)
+Also: Please see the [Release Manager section](https://github.com/hyperledger/fabric/blob/main/MAINTAINERS.md)
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

README.md

@@ -1,6 +1,6 @@
 # Hyperledger Fabric Chaincode Java
 
-[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Java/_apis/build/status/Fabric-Chaincode-Java?branchName=master)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Java/_build/latest?definitionId=39&branchName=master)
+[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Java/_apis/build/status/Fabric-Chaincode-Java?branchName=main)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Java/_build/latest?definitionId=39&branchName=main)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.hyperledger.fabric-chaincode-java/fabric-chaincode-shim/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.hyperledger.fabric-chaincode-java/fabric-chaincode-shim)
 [![Rocket.Chat](https://chat.hyperledger.org/images/join-chat.svg)](https://chat.hyperledger.org/channel/fabric-java-chaincode)
 
@@ -45,10 +45,10 @@ 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
+## 'dev' main 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 
+These 'dev' drivers are built from the main 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"

RELEASING.md

@@ -20,7 +20,7 @@ The following tasks are required before releasing:
 - Update test, sample, and docs files to match the new version
 - Create a new release notes file
 - Update the `CHANGELOG.md` file
-  
+
   The `changelog.sh` script in `scripts` will prepopulate the changelog but you must check and edit the file manually afterwards as required
 
 See the [[FABCJ-289] release: 2.2.0 LTS](https://github.com/hyperledger/fabric-chaincode-java/pull/124) pull request for an example, although be careful to search for all versions in the codebase as they're easy to miss and things change!
@@ -60,17 +60,17 @@ See the [Bump version to 2.2.1](https://github.com/hyperledger/fabric-chaincode-
 
 ## Interim Build Publishing
 
-The nightly Azure Pipeline Builds will also publish the 'dev' drivers to Artifactory. These can be accessed via the repository at 
+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
+These 'dev' drivers are built from the main 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

@@ -9,9 +9,9 @@ apply plugin: 'eclipse-wtp'
 version = '2.3.1'
 
 
-// If the nightly property is set, then this is the scheduled master 
+// If the nightly property is set, then this is the scheduled main 
 // 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()
@@ -36,7 +36,7 @@ subprojects {
 
     group = 'org.hyperledger.fabric-chaincode-java'
     version = rootProject.version
-    
+
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -58,7 +58,7 @@ subprojects {
 
     if (!it.name.equals('fabric-chaincode-protos')) {
         tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:all,-try" 
+            options.compilerArgs << "-Xlint:all,-try"
         }
     }
 
@@ -77,4 +77,4 @@ def getDate() {
     def date = new Date()
     def formattedDate = date.format('yyyyMMdd')
     return formattedDate
-}
+}

ci/azure-pipelines.yml

@@ -13,12 +13,12 @@ schedules:
     displayName: "Chaincode Java Nightly Driver"
     branches:
       include:
-        - master
+        - main
 
 trigger:
   branches:
     include:
-      - "master"
+      - "main"
   tags:
     include:
       - "*"
@@ -60,7 +60,7 @@ stages:
             inputs:
               workingDirectory: ""
               gradleWrapperFile: "gradlew"
-              gradleOptions: "-Xmx3072m"  
+              gradleOptions: "-Xmx3072m"
               javaHomeOption: "JDKVersion"
               jdkVersionOption: "1.8"
               jdkArchitectureOption: "x64"
@@ -69,19 +69,19 @@ stages:
               testResultsFiles: "$(System.DefaultWorkingDirectory)/**/TEST-*.xml"
               tasks: "build"
           - task: PublishBuildArtifacts@1
-            condition: or(succeeded(), failed()) 
+            condition: or(succeeded(), failed())
             inputs:
                pathToPublish: fabric-chaincode-shim/build/reports/checkstyle/
                artifactName: checkstylereport
             displayName: 'Checkstyle'
             continueOnError: true
           - task: PublishBuildArtifacts@1
-            condition: or(succeeded(), failed()) 
+            condition: or(succeeded(), failed())
             inputs:
                pathToPublish: fabric-chaincode-shim/build/reports/jacoco/
                artifactName: coveragereport
             displayName: 'JaCoCo Coverage'
-            continueOnError: true            
+            continueOnError: true
           - task: PublishTestResults@2
             inputs:
               testResultsFormat: 'JUnit'
@@ -104,28 +104,28 @@ stages:
           - task: PublishCodeCoverageResults@1
             inputs:
               summaryFileLocation: "$(System.DefaultWorkingDirectory)/**/fabric-chaincode-shim/build/reports/jacoco/test/jacocoTestReport.xml"
-            # Copy the built artifacts to the staging directory, tgz, and the docker image    
+            # Copy the built artifacts to the staging directory, tgz, and the docker image
           - script: |
               set -ev
               ./gradlew publishToMavenLocal
-              tar -zcvf localmaven.tgz ${HOME}/.m2/repository/org/hyperledger              
+              tar -zcvf localmaven.tgz ${HOME}/.m2/repository/org/hyperledger
               docker image save hyperledger/fabric-javaenv | gzip > $(Build.ArtifactStagingDirectory)/fabric-javaenv.tar.gz
-            displayName: 'Package tgz and docker image'    
-          - task: PublishBuildArtifacts@1    
+            displayName: 'Package tgz and docker image'
+          - task: PublishBuildArtifacts@1
             inputs:
               pathToPublish: localmaven.tgz
               artifactName: java-tgz
-          - task: PublishBuildArtifacts@1    
+          - task: PublishBuildArtifacts@1
             inputs:
               pathToPublish:  $(Build.ArtifactStagingDirectory)/fabric-javaenv.tar.gz
               artifactName: javaenv-docker-image
 
       - job: javadoc
         dependsOn: displayenv
         variables:
-          ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
-            javadoc_release: master
-          ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+          ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
+            javadoc_release: main
+          ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/main') }}:
             javadoc_release: $[format('release-{0}',dependencies.displayenv.outputs['BuildData.MINOR_PACKAGE_VERSION'])]
         steps:
           - script: ./gradlew javadoc
@@ -136,7 +136,7 @@ stages:
                 cp -r docs/* gh-pages
               fi
             displayName: 'Copy gh-pages doc'
-            condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+            condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
           - script: |
               git fetch origin
               git checkout -b gh-pages origin/gh-pages
@@ -146,7 +146,7 @@ stages:
 
               # if the gh-pages is present from the previous script, then copy across the files across.
               if [ -d gh-pages ]; then
-                find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'master' -o -name 'release-*' \) -exec rm -rf {} \;
+                find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'main' -o -name 'release-*' \) -exec rm -rf {} \;
                 cp -r gh-pages/* .
                 rm -rf gh-pages
               fi
@@ -174,7 +174,7 @@ stages:
               path: $(Build.SourcesDirectory)/build
           - script: |
               wget -qO "$PWD/manifest-tool" https://github.com/estesp/manifest-tool/releases/download/v1.0.0/manifest-tool-linux-amd64
-              chmod +x ./manifest-tool   
+              chmod +x ./manifest-tool
 
               docker image load --input build/fabric-javaenv.tar.gz
               docker images
@@ -185,7 +185,7 @@ stages:
               # push javaenv to repository
               docker push hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)
               ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-javaenv:$(BuildData.PACKAGE_VERSION)"
-              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-javaenv:$(BuildData.MINOR_PACKAGE_VERSION)"              
+              ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-javaenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-javaenv:$(BuildData.MINOR_PACKAGE_VERSION)"
             env:
               DOCKER_REGISTRY_USERNAME: $(DockerHub-Username)
               DOCKER_REGISTRY_PASSWORD: $(DockerHub-Password)
@@ -200,7 +200,7 @@ stages:
               ./gradlew -Psigning.keyId=${SIGNING_ID} -Psigning.password=${SIGNING_PASSWORD} -Psigning.secretKeyRingFile=${KEYRING_FILE} -PossrhUsername=${OSSRH_USER} -PossrhPassword=${OSSRH_PASSWORD} uploadArchives
             env:
               SIGNING_ID: $(JAR-Signing-Id)
-              SIGNING_PASSWORD: $(JAR-Signing-Password)              
+              SIGNING_PASSWORD: $(JAR-Signing-Password)
               KEYRING_FILE: $(keyring.secureFilePath)
               OSSRH_USER: $(OSSRH-User)
               OSSRH_PASSWORD: $(OSSRH-Password)
@@ -220,7 +220,7 @@ stages:
               ./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)              
+              SIGNING_PASSWORD: $(JAR-Signing-Password)
               KEYRING_FILE: $(keyring.secureFilePath)
               ARTIFACTORY_USER: $(ARTIFACTORY-User)
               ARTIFACTORY_PASSWORD: $(ARTIFACTORY-Password)

docs/_config.yml

@@ -1,6 +1,6 @@
 theme: minima
 title: "fabric-chaincode-java"
 releases:
-  - master
+  - main
   - release-1.4
   - release-2.2

docs/index.md

@@ -42,7 +42,7 @@ Check the [release notes](https://github.com/hyperledger/fabric-chaincode-java/r
 
 ## Compatibility
 
-For details on what versions of Java and Hyperledger Fabric can be used please see the [compatibility document](https://github.com/hyperledger/fabric-chaincode-java/blob/master/COMPATIBILITY.md).
+For details on what versions of Java and Hyperledger Fabric can be used please see the [compatibility document](https://github.com/hyperledger/fabric-chaincode-java/blob/main/COMPATIBILITY.md).
 
 ## Samples
 

fabric-chaincode-protos/build.gradle

@@ -17,7 +17,7 @@ repositories {
 }
 
 // Fabric branch to download proto files from
-def fabricBranch = 'master'
+def fabricBranch = 'main'
 // Fabric Github repository link
 def fabricRepo = 'https://raw.githubusercontent.com/hyperledger/fabric-protos'
 def protosDir = 'src/main/protos'