[FAB-8283] Prepare for Fabric v1.1.0-rc1

Prepare for Fabric v1.1.0-rc1 Change-Id: I228676371101b08e1cc37454d085ed20e0b1e820 Signed-off-by: David Enyeart <[email protected]>
hyperledger · Mar 1, 2018 · 8352cb8 · 8352cb8
1 parent 23e1250
commit 8352cb8
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@
 #     use in the local machine.
 #   - docker-thirdparty - pulls thirdparty images (kafka,zookeeper,couchdb)
 
-BASE_VERSION = 1.1.0-beta
+BASE_VERSION = 1.1.0-rc1
 PREV_VERSION = 1.1.0-alpha
 CHAINTOOL_RELEASE=1.0.1
 BASEIMAGE_RELEASE=0.4.6
@@ -53,8 +53,8 @@ PROJECT_NAME = $(PROJECT_NAME)/fabric
 else
 PROJECT_NAME = hyperledger/fabric
 endif
-IS_RELEASE = false
-EXPERIMENTAL ?= true
+IS_RELEASE = true
+EXPERIMENTAL ?= false
 
 ifeq ($(EXPERIMENTAL),true)
 GO_TAGS += experimental

diff --git a/docs/source/couchdb_as_state_database.rst b/docs/source/couchdb_as_state_database.rst
@@ -67,14 +67,10 @@ fields is provided:
 
 .. code:: bash
 
-  {"index":{"fields":["data.docType","data.owner"]},"ddoc":"indexOwnerDoc", "name":"indexOwner","type":"json"}
+  {"index":{"fields":["docType","owner"]},"ddoc":"indexOwnerDoc", "name":"indexOwner","type":"json"}
 
 The sample index can be found `here <https://github.com/hyperledger/fabric-samples/blob/master/chaincode/marbles02/go/META-INF/statedb/couchdb/indexes/indexOwner.json>`__.
 
-.. note:: In 1.1 alpha, the “data” wrapper must be specified for each field referenced
-          in the index definition. In subsequent releases the requirement to specify
-          the “data” wrapper may be lifted.
-
 Any index in the chaincode’s ``META-INF/statedb/couchdb/indexes`` directory
 will be packaged up with the chaincode for deployment. When the chaincode is
 both installed on a peer and instantiated on one of the peer’s channels, the

diff --git a/docs/source/releases.rst b/docs/source/releases.rst
@@ -1,6 +1,42 @@
 Release Notes
 =============
 
+`v1.1.0-rc1 <https://github.com/hyperledger/fabric/releases/tag/v1.1.0-rc1>`__ - March 1, 2018
+----------------------------------------------------------------------------------------------
+The v1.1 release candidate 1 (rc1) includes all of the features delivered in v1.1.0-preview
+and v1.1.0-alpha.
+
+  Additionally, there are feature improvements, bug fixes, documentation and test
+  coverage improvements, UX improvements based on user feedback and changes to address a
+  variety of static scan findings (unused code, static security scanning, spelling,
+  linting and more).
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+The fabric-ccenv image which is used to build chaincode, currently includes
+the github.com/hyperledger/fabric/core/chaincode/shim ("shim") package.
+This is convenient, as it provides the ability to package chaincode
+without the need to include the "shim". However, this may cause issues in future
+releases (and/or when trying to use packages which are included by the "shim").
+
+In order to avoid any issues, users are advised to manually vendor the "shim"
+package with their chaincode prior to using the peer CLI for packaging and/or
+for installing chaincode.
+
+Please refer to `FAB-5177 <https://jira.hyperledger.org/browse/FAB-5177>`__ for more details,
+and kindly be aware that given the above, we may end up changing the
+fabric-ccenv in the future.
+
+`Change Log <https://github.com/hyperledger/fabric/blob/master/CHANGELOG.md#v110-rc1>`__
+
 `v1.1.0-alpha <https://github.com/hyperledger/fabric/releases/tag/v1.1.0-alpha>`__ - January 25, 2018
 -----------------------------------------------------------------------------------------------------
 This is a feature-complete *alpha* release of the up-coming 1.1 release. The 1.1 release

diff --git a/docs/source/samples.rst b/docs/source/samples.rst
@@ -30,7 +30,7 @@ execute the following commands:
   git checkout {TAG}　
 
 .. note:: To ensure the samples are compatible with the version of Fabric binaries you download below,
-          checkout the samples ``{TAG}`` that matches your Fabric version, for example, v1.1.0-alpha.
+          checkout the samples ``{TAG}`` that matches your Fabric version, for example, v1.1.0-rc1.
           To see a list of all fabric-samples tags, use command "git tag".
 
 .. _binaries:
@@ -49,7 +49,7 @@ you will extract the platform-specific binaries:
 
 .. code:: bash
 
-  curl -sSL https://goo.gl/6wtTN5 | bash -s 1.1.0-alpha
+  curl -sSL https://goo.gl/6wtTN5 | bash -s 1.1.0-rc1
 
 .. note:: If you get an error running the above curl command, you may
           have too old a version of curl that does not handle
@@ -62,7 +62,7 @@ you will extract the platform-specific binaries:
 	  https://github.com/hyperledger/fabric/blob/master/scripts/bootstrap.sh
 
 .. note:: You can use the command above for any published version of Hyperledger
-          Fabric. Simply replace '1.1.0-alpha' with the version identifier
+          Fabric. Simply replace '1.1.0-rc1' with the version identifier
           of the version you wish to install.
 
 The command above downloads and executes a bash script

diff --git a/release_notes/v1.1.0-rc1.txt b/release_notes/v1.1.0-rc1.txt
@@ -0,0 +1,40 @@
+v1.1.0-rc1 March 1, 2018
+-------------------------------
+
+Release Notes
+-------------
+The v1.1 release candidate 1 (rc1) includes all of the features delivered in v1.1.0-preview
+and v1.1.0-alpha.
+
+Additionally, there are feature improvements, bug fixes, documentation and test
+coverage improvements, UX improvements based on user feedback and changes to address a
+variety of static scan findings (unused code, static security scanning, spelling,
+linting and more).
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+The fabric-ccenv image which is used to build chaincode, currently includes
+the github.com/hyperledger/fabric/core/chaincode/shim ("shim") package.
+This is convenient, as it provides the ability to package chaincode
+without the need to include the "shim". However, this may cause issues in future
+releases (and/or when trying to use packages which are included by the "shim").
+
+In order to avoid any issues, users are advised to manually vendor the "shim"
+package with their chaincode prior to using the peer CLI for packaging and/or
+for installing chaincode.
+
+Please refer to https://jira.hyperledger.org/browse/FAB-5177 for more details,
+and kindly be aware that given the above, we may end up changing the
+fabric-ccenv in the future.
+
+Change Log
+----------
+https://github.com/hyperledger/fabric/blob/master/CHANGELOG.md#v110-rc1
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -10,7 +10,7 @@ export VERSION=${1:-1.0.4}
 # current version of fabric-ca released
 export CA_VERSION=${2:-$VERSION}
 # current version of thirdparty images (couchdb, kafka and zookeeper) released
-export THIRDPARTY_IMAGE_VERSION=0.4.5
+export THIRDPARTY_IMAGE_VERSION=0.4.6
 export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
 #Set MARCH variable i.e ppc64le,s390x,x86_64,i386
 MARCH=`uname -m`