[FAB-11879] Update app capabilities for V1_3

Update application capabilities to consistently use V1_3 with common
comments across fabric repository configtx files.

FAB-11879 #done

Change-Id: I8d8a3a867f209428574227569667d100ebbba3d0
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

Author: denyeart

examples/e2e_cli/configtx.yaml

@@ -157,33 +157,43 @@ Organizations:
 ################################################################################
 Capabilities:
     # Channel capabilities apply to both the orderers and the peers and must be
-    # supported by both.  Set the value of the capability to true to require it.
-    Global: &ChannelCapabilities
+    # supported by both.
+    # Set the value of the capability to true to require it.
+    Channel: &ChannelCapabilities
         # V1.3 for Channel is a catchall flag for behavior which has been
-        # determined to be desired for all orderers and peers running < v1.3.0,
-        # but the modification of which would cause incompatibilities.  Users
-        # should leave this flag set to true.
+        # determined to be desired for all orderers and peers running at the v1.3.x
+        # level, but which would be incompatible with orderers and peers from
+        # prior releases.
+        # Prior to enabling V1.3 channel capabilities, ensure that all
+        # orderers and peers on a channel are at v1.3.0 or later.
         V1_3: true
 
     # Orderer capabilities apply only to the orderers, and may be safely
-    # manipulated without concern for upgrading peers.  Set the value of the
-    # capability to true to require it.
+    # used with prior release peers.
+    # Set the value of the capability to true to require it.
     Orderer: &OrdererCapabilities
-        # V1.1 for Order is a catchall flag for behavior which has been
-        # determined to be desired for all orderers running v1.0.x, but the
-        # modification of which  would cause incompatibilities.  Users should
-        # leave this flag set to true.
+        # V1.1 for Orderer is a catchall flag for behavior which has been
+        # determined to be desired for all orderers running at the v1.1.x
+        # level, but which would be incompatible with orderers from prior releases.
+        # Prior to enabling V1.1 orderer capabilities, ensure that all
+        # orderers on a channel are at v1.1.0 or later.
         V1_1: true
 
     # Application capabilities apply only to the peer network, and may be safely
-    # manipulated without concern for upgrading orderers.  Set the value of the
-    # capability to true to require it.
+    # used with prior release orderers.
+    # Set the value of the capability to true to require it.
     Application: &ApplicationCapabilities
-        # V1.1 for Application is a catchall flag for behavior which has been
-        # determined to be desired for all peers running v1.0.x, but the
-        # modification of which would cause incompatibilities.  Users should
-        # leave this flag set to true.
-        V1_2: true
+        # V1.3 for Application enables the new non-backwards compatible
+        # features and fixes of fabric v1.3.
+        V1_3: true
+        # V1.2 for Application enables the new non-backwards compatible
+        # features and fixes of fabric v1.2 (note, this need not be set if
+        # later version capabilities are set)
+        V1_2: false
+        # V1.1 for Application enables the new non-backwards compatible
+        # features and fixes of fabric v1.1 (note, this need not be set if
+        # later version capabilities are set).
+        V1_1: false
 
 ################################################################################
 #

integration/pvtdata/runner/testdata/configtx.yaml

@@ -23,12 +23,12 @@ Organizations:
         Port: 8051
 
 Capabilities:
-  Global: &ChannelCapabilities
+  Channel: &ChannelCapabilities
     V1_3: true
   Orderer: &OrdererCapabilities
     V1_1: true
   Application: &ApplicationCapabilities
-    V1_2: true
+    V1_3: true
 
 Application: &ApplicationDefaults
   Organizations:

sampleconfig/configtx.yaml

@@ -77,37 +77,42 @@ Organizations:
 ################################################################################
 Capabilities:
     # Channel capabilities apply to both the orderers and the peers and must be
-    # supported by both.  Set the value of the capability to true to require it.
+    # supported by both.
+    # Set the value of the capability to true to require it.
     Channel: &ChannelCapabilities
         # V1.3 for Channel is a catchall flag for behavior which has been
-        # determined to be desired for all orderers and peers running < v1.3.0,
-        # but the modification of which would cause incompatibilities.  Users
-        # should leave this flag set to true.
+        # determined to be desired for all orderers and peers running at the v1.3.x
+        # level, but which would be incompatible with orderers and peers from
+        # prior releases.
+        # Prior to enabling V1.3 channel capabilities, ensure that all
+        # orderers and peers on a channel are at v1.3.0 or later.
         V1_3: true
 
     # Orderer capabilities apply only to the orderers, and may be safely
-    # manipulated without concern for upgrading peers.  Set the value of the
-    # capability to true to require it.
+    # used with prior release peers.
+    # Set the value of the capability to true to require it.
     Orderer: &OrdererCapabilities
-        # V1.1 for Order is a catchall flag for behavior which has been
-        # determined to be desired for all orderers running v1.0.x, but the
-        # modification of which  would cause incompatibilities.  Users should
-        # leave this flag set to true.
+        # V1.1 for Orderer is a catchall flag for behavior which has been
+        # determined to be desired for all orderers running at the v1.1.x
+        # level, but which would be incompatible with orderers from prior releases.
+        # Prior to enabling V1.1 orderer capabilities, ensure that all
+        # orderers on a channel are at v1.1.0 or later.
         V1_1: true
 
-    # Application capabilities apply only to the peer network, and may be
-    # safely manipulated without concern for upgrading orderers.  Set the value
-    # of the capability to true to require it.
+    # Application capabilities apply only to the peer network, and may be safely
+    # used with prior release orderers.
+    # Set the value of the capability to true to require it.
     Application: &ApplicationCapabilities
-        # V1.2 for Application enables the new non-backwards compatible
+        # V1.3 for Application enables the new non-backwards compatible
         # features and fixes of fabric v1.3.
         V1_3: true
         # V1.2 for Application enables the new non-backwards compatible
-        # features and fixes of fabric v1.2, it implies V1_1.
+        # features and fixes of fabric v1.2 (note, this need not be set if
+        # later version capabilities are set)
         V1_2: false
         # V1.1 for Application enables the new non-backwards compatible
         # features and fixes of fabric v1.1 (note, this need not be set if
-        # V1_2 is set).
+        # later version capabilities are set).
         V1_1: false
 
 ################################################################################