Updates in main branch for v2.5.0 release (hyperledger#4138)

Updates in main docs and scripts for v2.5.0 release.

Signed-off-by: David Enyeart <[email protected]>

README.md

@@ -27,10 +27,13 @@ support (LTS) releases. Important fixes will be backported to the most recent
 LTS release, and to the prior LTS release during periods of LTS release overlap.
 For more details see the [LTS strategy](https://github.com/hyperledger/fabric-rfcs/blob/main/text/0005-lts-release-strategy.md).
 
-LTS release:
-- [v2.2.x](https://hyperledger-fabric.readthedocs.io/en/release-2.2/whatsnew.html) (current LTS release)
+Current LTS release:
+- [v2.2.5](https://hyperledger-fabric.readthedocs.io/en/release-2.5/whatsnew.html)
 
 Prior LTS release:
+- [v2.2.x](https://hyperledger-fabric.readthedocs.io/en/release-2.2/whatsnew.html) (maintained through December 2023)
+
+Historic LTS releases:
 - [v1.4.x](https://hyperledger-fabric.readthedocs.io/en/release-1.4/whatsnew.html) (maintenance ended in April 2021 with the delivery of v1.4.12)
 
 Unless specified otherwise, all releases will be upgradable from the prior minor release.
@@ -45,6 +48,7 @@ Please visit the [GitHub issues with Epic label](https://github.com/hyperledger/
 Please visit our
 online documentation for
 information on getting started using and developing with the fabric, SDK and chaincode:
+- [v2.5](http://hyperledger-fabric.readthedocs.io/en/release-2.5/)
 - [v2.4](http://hyperledger-fabric.readthedocs.io/en/release-2.4/)
 - [v2.3](http://hyperledger-fabric.readthedocs.io/en/release-2.3/)
 - [v2.2](http://hyperledger-fabric.readthedocs.io/en/release-2.2/)

docs/source/install.md

@@ -43,8 +43,8 @@ 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.9')
-        -c, --ca-version: Fabric CA Version (default: '1.5.5')
+        -f, --fabric-version: FabricVersion (default: '2.5.0')
+        -c, --ca-version: Fabric CA Version (default: '1.5.6')
 ```
 
 ## Choosing which components
@@ -70,10 +70,10 @@ If no arguments are supplied, then the arguments `docker binary samples` are ass
 
 By default the latest version of the components are used; these can be altered by using the options `--fabric-version` and `-ca-version`.  `-f` and `-c` are the respective short forms.
 
-For example, to download the v2.2.1 binaries, run this command
+For example, to download the v2.5.0 binaries, run this command
 
 ```bash
-./install-fabric.sh --fabric-version 2.2.1 binary
+./install-fabric.sh --fabric-version 2.5.0 binary
 ```
 
 You have completed installing Fabric samples, Docker images, and binaries to your system.

docs/source/whatsnew.rst

@@ -1,6 +1,34 @@
 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 current 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
 -------------------------------------
 
@@ -39,11 +67,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
 -------------------------------------
 
@@ -309,29 +332,7 @@ 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>`_.
-* `Fabric v2.4.5 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.5>`_.
-* `Fabric v2.4.6 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.6>`_.
-* `Fabric v2.4.7 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.7>`_.
-* `Fabric v2.4.8 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.8>`_.
-* `Fabric v2.4.9 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.4.9>`_.
+* `Fabric v2.5.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.5.0>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/

scripts/bootstrap.sh

@@ -6,9 +6,9 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.4.9
+VERSION=2.5.0
 # if ca version not passed in, default to latest released version
-CA_VERSION=1.5.5
+CA_VERSION=1.5.6
 
 REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}
 
@@ -30,8 +30,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.9 1.5.5 -s"
-    echo "will download docker images and binaries for Fabric v2.4.9 and Fabric CA v1.5.5"
+    echo "e.g. bootstrap.sh 2.5.0 1.5.6 -s"
+    echo "will download docker images and binaries for Fabric v2.5.0 and Fabric CA v1.5.6"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories

scripts/install-fabric.sh

@@ -21,8 +21,8 @@ _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.9"
-_arg_ca_version="1.5.5"
+_arg_fabric_version="2.5.0"
+_arg_ca_version="1.5.6"
 
 REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}
 
@@ -55,8 +55,8 @@ 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.9')"
-	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.5')"
+	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.0')"
+	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.6')"
 }