Apply previous main branch changes following branch rename

Signed-off-by: Mark S. Lewis <[email protected]>

Author: bestbeforetoday

.github/settings.yml

@@ -2,7 +2,7 @@ repository:
   name: fabric-gateway-java
   description: Hyperledger Fabric Gateway SDK for Java https://wiki.hyperledger.org/display/fabric
   homepage: https://hyperledger.github.io/fabric-gateway-java/
-  default_branch: master
+  default_branch: main
   has_downloads: true
   has_issues: false
   has_projects: false

.github/workflows/pull_request.yml

@@ -3,7 +3,7 @@ name: Pull request
 on:
   pull_request:
     branches:
-      - release-2.2
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/push.yml

@@ -3,7 +3,7 @@ name: Push
 on:
   push:
     branches:
-      - release-2.2
+      - main
 
 jobs:
   build:

.github/workflows/schedule.yml

@@ -0,0 +1,9 @@
+name: Scheduled build
+
+on:
+  schedule:
+    - cron: "55 0 * * *"
+
+jobs:
+  main:
+    uses: ./.github/workflows/test.yml

.github/workflows/vulnerability-scan.yml

@@ -0,0 +1,25 @@
+name: "Security vulnerability scan"
+
+on:
+  schedule:
+    - cron: "20 23 * * *"
+
+jobs:
+  scan:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          cache: maven
+      - name: Scan
+        run: mvn -P owasp dependency-check:check
+      - name: "Archive dependency-check report"
+        if: success() || failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: dependency-check-report
+          path: target/dependency-check-report.html

CONTRIBUTING.md

@@ -9,10 +9,10 @@ docs to learn how to make contributions to this exciting project.
 
 ## 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).
 
 <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,4 +1,6 @@
-# Hyperledger Fabric Gateway SDK for Java
+# Hyperledger Fabric Gateway SDK for Java <a href="https://github.com/hyperledger/fabric-gateway-java/actions/workflows/schedule.yml"><img src="https://github.com/hyperledger/fabric-gateway-java/actions/workflows/schedule.yml/badge.svg" alt="Build status" style="float: right"></a>
+
+> **Note:** When developing applications for Hyperledger Fabric v2.4 and later, you should use the [Fabric Gateway client API](https://hyperledger.github.io/fabric-gateway/).
 
 The Fabric Gateway SDK allows applications to interact with a Fabric blockchain network.  It provides a simple API to submit transactions to a ledger or query the contents of a ledger with minimal code.
 
@@ -62,7 +64,7 @@ class Sample {
 ### API documentation
 
 Full Javadoc documentation is published for each of the following versions:
-- [2.2](https://hyperledger.github.io/fabric-gateway-java/release-2.2/)
+- [2.2](https://hyperledger.github.io/fabric-gateway-java/main/)
 - [1.4](https://hyperledger.github.io/fabric-gateway-java/release-1.4/)
 
 ### Maven
@@ -89,11 +91,11 @@ implementation 'org.hyperledger.fabric:fabric-gateway-java:2.2.0'
 
 The following table shows versions of Fabric, Java and other dependencies that are explicitly tested and that are supported for use with version 2.2 of the Fabric Gateway SDK. Refer to the appropriate GitHub branch for compatibility of other release versions.
 
-|     | Tested | Supported |
-| --- | ------ | --------- |
+| | Tested | Supported |
+| --- | --- | --- |
 | **Fabric** | 2.2 | 2.2 |
-| **Java** | 8, 11 | 8+ |
-| **Platform** | Ubuntu 20.04 | |
+| **Java** | 8, 11, 17 | 8+ |
+| **Platform** | Ubuntu 22.04 | |
 
 #### Client applications running on POWER architecture
 To run Java SDK clients on IBM POWER systems (e.g. zLinux), use Java 11 and set the SSL provider to ‘JDK’ by either supplying the -D command line option:

dependency-suppressions.xml

@@ -20,13 +20,6 @@
         <packageUrl regex="true">^pkg:maven/org\.hyperledger\.fabric\-sdk\-java/fabric\-sdk\-java@.*$</packageUrl>
         <cve>CVE-2022-36023</cve>
     </suppress>
-    <suppress>
-        <notes><![CDATA[
-       Vulnerability in WebKit browser, not netty-tcnative-boringssl
-       ]]></notes>
-        <packageUrl regex="true">^pkg:maven/io\.netty/netty\-tcnative\-boringssl\-static@.*$</packageUrl>
-        <cve>CVE-2011-1797</cve>
-    </suppress>
     <suppress>
         <notes><![CDATA[
         fabric-sdk-java only uses SnakeYaml's SafeConstructor for parsing YAML, which mitigates the vulnerability

pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -309,7 +309,6 @@
                         <version>3.2.0</version>
                         <configuration>
                             <configLocation>checkstyle.xml</configLocation>
-                            <encoding>UTF-8</encoding>
                             <consoleOutput>true</consoleOutput>
                             <failsOnError>true</failsOnError>
                             <linkXRef>false</linkXRef>

scripts/ci_scripts/publishApiDocs.sh

@@ -15,7 +15,8 @@ set -e -o pipefail
 : "${SOURCE_BRANCH:?}" # Source code branch name
 : "${JAVADOC_DIR:?}" # Directory where built JavaDoc is located
 
-readonly COMMIT_HASH=$(git rev-parse HEAD)
+COMMIT_HASH=$(git rev-parse HEAD)
+readonly COMMIT_HASH
 readonly PUBLISH_RELEASE_DIR="${PUBLISH_DIR}/${SOURCE_BRANCH}"
 
 cleanPublishDir() {
@@ -49,7 +50,7 @@ publishDocs() {
 }
 
 _stagingPushDocs() {
-    if [ -z "$(git status --porcelain=v1)" 2>/dev/null ]; then
+    if [ -z "$(git status --porcelain=v1 2>/dev/null)" ]; then
         echo 'No changes to publish'
         return
     fi

scripts/ci_scripts/publishJavaArtifacts.sh

@@ -17,8 +17,8 @@
  * instance state related to events received during its lifetime.
  * <p>Implementations may use {@link org.hyperledger.fabric.gateway.Network#addCommitListener(CommitListener, java.util.Collection, String)}
  * to identify when specific peers have committed the transaction they are tracking.</p>
- * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/release-2.2/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandlerFactory.java">SampleCommitHandlerFactory</a>
- * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/release-2.2/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandler.java">SampleCommitHandler</a>
+ * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/main/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandlerFactory.java">SampleCommitHandlerFactory</a>
+ * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/main/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandler.java">SampleCommitHandler</a>
  */
 public interface CommitHandler {
     /**

src/main/java/org/hyperledger/fabric/gateway/spi/CommitHandler.java

@@ -11,8 +11,8 @@
 /**
  * Functional interface describing a factory function for constructing {@link CommitHandler} instances.
  * <p>Default implementations can be obtained from {@link org.hyperledger.fabric.gateway.DefaultCommitHandlers}.</p>
- * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/release-2.2/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandlerFactory.java">SampleCommitHandlerFactory</a>
- * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/release-2.2/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandler.java">SampleCommitHandler</a>
+ * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/main/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandlerFactory.java">SampleCommitHandlerFactory</a>
+ * @see <a href="https://github.com/hyperledger/fabric-gateway-java/blob/main/src/test/java/org/hyperledger/fabric/gateway/sample/SampleCommitHandler.java">SampleCommitHandler</a>
  */
 @FunctionalInterface
 public interface CommitHandlerFactory {