Release commit for v2.5.0-beta

Update docs and release notes for v2.5.0-beta. Signed-off-by: David Enyeart <enyeart@us.ibm.com>
hyperledger · Jan 26, 2023 · e8dc396 · e8dc396
1 parent 771cf7e
commit e8dc396
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 42 deletions.
diff --git a/Makefile b/Makefile
@@ -47,7 +47,7 @@
 #   - verify - runs unit tests for only the changed package tree
 
 UBUNTU_VER ?= 20.04
-FABRIC_VER ?= 2.5.0
+FABRIC_VER ?= 2.5.0-beta
 
 # 3rd party image version
 # These versions are also set in the runners in ./integration/runners/

diff --git a/docs/source/install.md b/docs/source/install.md
@@ -43,7 +43,7 @@ Run the script with the `-h` option to see the options:
 ./install-fabric.sh -h
 Usage: ./install-fabric.sh [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...
         <comp>: Component to install one or more of  d[ocker]|b[inary]|s[amples]. If none specified, all will be installed
-        -f, --fabric-version: FabricVersion (default: '2.4.4')
+        -f, --fabric-version: FabricVersion (default: '2.4.8')
         -c, --ca-version: Fabric CA Version (default: '1.5.5')
 ```
 

diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst
@@ -1,6 +1,35 @@
 What's new in Hyperledger Fabric v2.x
 =====================================
 
+What's New in Hyperledger Fabric v2.5
+-------------------------------------
+
+Purge history of private data
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+While it has always been possible to delete private data from current state, this new feature enables purging the history of private data from a peer while preserving a hash of the private data as immutable evidence on the blockchain.
+
+* Useful for purging private data on demand for privacy reasons or to adhere to government regulations.
+* Deletes private data from state and from peer’s private data history so that it can no longer be queried from block events or from other peers.
+* Available as a new chaincode API `PurgePrivateData()`.
+* Requires setting application capability to `V2_5` in channel configuration
+
+For more details, see the :doc:`private-data/private-data` topic.
+
+Multi-architecture binaries and docker images are now available
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The release binaries and docker images have been updated as follows:
+
+* Support for amd64 and arm64.
+* Release binaries are statically linked for maximum portability.
+* Docker images utilize dynamically linked binaries and are now based on Ubuntu (rather than Alpine) to make them more consistent with typical production runtime environments (production runtime environments are typically based on glibc and often require dynamic linking of HSM modules).
+
+.. note::
+
+   Fabric v2.5.0 is expected to become the next long-term support (LTS) release. A simple in-place upgrade from the prior LTS (Fabric v2.2.x) release is possible.
+
+
 What's New in Hyperledger Fabric v2.4
 -------------------------------------
 
@@ -40,10 +69,6 @@ This command will be useful, for example, in the following scenarios:
 For more information, see the `peer lifecycle chaincode calculatepackageid` :doc:`command reference topic<commands/peerlifecycle>`.
 
 
-.. note::
-
-   While Fabric v2.4.0 introduces new features, Fabric v2.2.x remains the current long-term support release until the next LTS release is announced.
-
 What's New in Hyperledger Fabric v2.3
 -------------------------------------
 
@@ -306,27 +331,9 @@ Release notes
 =============
 
 The release notes provide more details for users moving to the new release.
-Specifically, take a look at the changes and deprecations
-announced in each of the v2.x releases.
-
-* `Fabric v2.0.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.0>`_.
-* `Fabric v2.0.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.1>`_.
-* `Fabric v2.1.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.1.0>`_.
-* `Fabric v2.1.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.1.1>`_.
-* `Fabric v2.2.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.0>`_.
-* `Fabric v2.2.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.1>`_.
-* `Fabric v2.2.2 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.2>`_.
-* `Fabric v2.2.3 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.3>`_.
-* `Fabric v2.2.4 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.4>`_.
-* `Fabric v2.3.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.0>`_.
-* `Fabric v2.3.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.1>`_.
-* `Fabric v2.3.2 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.2>`_.
-* `Fabric v2.3.3 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.3>`_.
-* `Fabric v2.4.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.0>`_.
-* `Fabric v2.4.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.1>`_.
-* `Fabric v2.4.2 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.2>`_.
-* `Fabric v2.4.3 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.3>`_.
-* `Fabric v2.4.4 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.4>`_.
+Specifically, take a look at the changes and deprecations.
+
+* `Fabric v2.5.0-beta release notes <https://github.com/hyperledger/fabric/releases/tag/v2.5.0-beta>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/
diff --git a/release_notes/v2.5.0-beta.md b/release_notes/v2.5.0-beta.md
@@ -1,5 +1,5 @@
-v2.5.0 Release Notes - <Date TBD>
-=================================
+v2.5.0-beta Release Notes - January 26, 2023
+============================================
 
 New features
 ------------
@@ -28,12 +28,6 @@ The release binaries and docker images have been updated as follows:
 
 Orderer configuration SendBufferSize default has changed from `10` to `100` to improve performance of large workloads.
 
-
-**Peer gateway service now retries failed submissions to ordering service**
-
-The peer gateway service is designed to reduce the burden of client application development including delegation of error handling and retries to the peer gateway service so that client applications can focus on business functionality.
-When peer gateway service receives a 500 error from an ordering service node upon transaction submission, it will now retry the submission on the other ordering service nodes.
-
 **Peer gateway service now supports seamless resumption of chaincode event listening**
 
 Client applications can now resume chaincode event listening after a disconnect and reconnect without receiving any duplicate or missing events.
@@ -42,12 +36,12 @@ The client must specify an AfterTransactionId property in addition to a start bl
 
 Fixes
 -----
-All fixes as of v2.4.7 are also included in v2.5.0.
+All fixes as of v2.4.8 are also included in v2.5.0-beta.
 
 
 Dependencies
 ------------
-Fabric v2.5.0 has been tested with the following dependencies:
+Fabric v2.5.0-beta has been tested with the following dependencies:
 * Go 1.18.10
 * CouchDB v3.2.2
 

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -6,7 +6,7 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.4.4
+VERSION=2.4.8
 # if ca version not passed in, default to latest released version
 CA_VERSION=1.5.5
 ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m |sed 's/x86_64/amd64/g')" |sed 's/darwin-arm64/darwin-amd64/g')
@@ -21,8 +21,8 @@ printHelp() {
     echo "-s : bypass fabric-samples repo clone"
     echo "-b : bypass download of platform-specific binaries"
     echo
-    echo "e.g. bootstrap.sh 2.4.4 1.5.5 -s"
-    echo "will download docker images and binaries for Fabric v2.4.4 and Fabric CA v1.5.5"
+    echo "e.g. bootstrap.sh 2.4.8 1.5.5 -s"
+    echo "will download docker images and binaries for Fabric v2.4.8 and Fabric CA v1.5.5"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories

diff --git a/scripts/install-fabric.sh b/scripts/install-fabric.sh
@@ -21,7 +21,7 @@ _arg_comp=('' )
 
 # if version not passed in, default to latest released version
 # if ca version not passed in, default to latest released version
-_arg_fabric_version="2.4.4"
+_arg_fabric_version="2.4.8"
 _arg_ca_version="1.5.5"
 
 REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}
@@ -50,7 +50,7 @@ print_help()
 {
 	printf 'Usage: %s [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...\n' "$0"
 	printf '\t%s\n' "<comp> Component to install, one or more of  docker | binary | samples | podman  First letter of component also accepted; If none specified docker | binary | samples is assumed"
-	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.4.4')"
+	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.4.8')"
 	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.5')"
 }