Prep. for potential 1.2.0 release (#498)

* Prep. for potential 1.2.0 release

* Update CHANGELOG and NOTICE files

Author: mrutkows

CHANGELOG.md

@@ -19,35 +19,46 @@
 
 # Changelog
 
+## v1.2.0
+
+- Update for travis migration (#492)
+- bump openwhisk-client-go dependency (#493)
+- remove trailing slash on apihost #481 (#485)
+- recognize .rs extension as a Rust action kind (#495)
+- Remove last Godeps, update Gogradle for gomod and Ansible setup (#496)
+- Update Gradle/Wrapper to latest version (#497)
+
 ## v1.1.0
-  * Upgrade all Go dependencies to latest (#490)
-  * Migrated to using go mod to manage dependencies (#489)
-  * Upgrade travis to go 1.15
-  * Support passing del annotation (#488)
-  * Add an overwrite flag to "package bind" (#474)
-  * Trigger parameter issue (#479)
-  * remove test for download of iOS SDK (#478)
-  * build binary test artifacts (#477)
-  * Update test file (#463)
-  * Fix regex for log stripping. (#462)
-  * Ensure that the pollSince is greater than Activation start time (#461)
+
+- Upgrade all Go dependencies to latest (#490)
+- Migrated to using go mod to manage dependencies (#489)
+- Upgrade travis to go 1.15
+- Support passing del annotation (#488)
+- Add an overwrite flag to "package bind" (#474)
+- Trigger parameter issue (#479)
+- remove test for download of iOS SDK (#478)
+- build binary test artifacts (#477)
+- Update test file (#463)
+- Fix regex for log stripping. (#462)
+- Ensure that the pollSince is greater than Activation start time (#461)
 
 ## v1.0.0
-  * Allow log stripping to tolerate a missing stream identifier. (#444)
-  * Add --logs options on activation get to return stripped logs as a convenience. (#445)
-  * RestAssured fixes (#441)
-  * Remove namespace property from wskprops (#434)
-  * "wsk property get" can now return raw output for specific properties  (#430)
-  * Add dynamic column sizing to wsk activation list command (#427)
+
+- Allow log stripping to tolerate a missing stream identifier. (#444)
+- Add --logs options on activation get to return stripped logs as a convenience. (#445)
+- RestAssured fixes (#441)
+- Remove namespace property from wskprops (#434)
+- "wsk property get" can now return raw output for specific properties  (#430)
+- Add dynamic column sizing to wsk activation list command (#427)
 
 ## v0.10.0
 
-* Integrate wskdeploy via `project` subcommand
-* Enhanced columnar output in `activation list`
-* CLI support for OpenWhisk enhancements including:
-  * Support for specifying intra-container concurrency
-  * New supported action languages: Ballerina, .Net, and Go
+- Integrate wskdeploy via `project` subcommand
+- Enhanced columnar output in `activation list`
+- CLI support for OpenWhisk enhancements including:
+- Support for specifying intra-container concurrency
+- New supported action languages: Ballerina, .Net, and Go
 
 ## v0.9.0
 
-* Initial release as an Apache Incubator project.
+- Initial release as an Apache Incubator project.

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache OpenWhisk Command-line Interface (CLI)
-Copyright 2016-2020 The Apache Software Foundation
+Copyright 2016-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README.md

@@ -59,7 +59,7 @@ We also provide instructions on how to build your own binaries from source code.
 
 You can copy the `wsk` binary to any folder, and add the folder to your system `PATH` in order to run the OpenWhisk CLI command from anywhere on your system. To get the CLI command help, execute the following:
 
-```
+```sh
 $ wsk --help
 ```
 
@@ -90,7 +90,7 @@ git clone [email protected]:apache/openwhisk-cli
 or you can specify a release (tag) if you do not want the latest code by using the `--branch <tag>` flag. For example, you can clone the source code for the tagged 1.1.0 [release](https://github.com/apache/openwhisk-cli/releases/tag/1.1.0)
 
 ```sh
-git clone --branch 1.1.0 [email protected]:apache/openwhisk-clie
+git clone --branch 1.1.0 [email protected]:apache/openwhisk-cli
 ```
 
 You can also pull the code from a fork of the repository. If you intend to become a Contributor to the project, read the section [Contributing to the project](#contributing-to-the-project) below on how to setup a fork.
@@ -226,7 +226,7 @@ $ go test -tags=unit -v
 
 All tests can be run using the Gradle script:
 
-```
+```sh
 $ ./gradlew goTest -PgoTags=unit
 $ ./gradlew goTest -PgoTags=native
 ```
@@ -272,7 +272,7 @@ Integration tests are best left to the Travis build as they depend on a fully fu
 Please use `go get` to add new dependencies to the `go.mod` file:
 
 ```sh
-go get github.com/project/[email protected]
+go get -u github.com/project/[email protected]
 ```
 
 > Please avoid using commit hashes for referencing non-OpenWhisk libraries.
@@ -289,22 +289,10 @@ go mod tidy
 
 Although you might be tempted to edit the go.mod file directly, please use the recommended method of using the `go get` command:
 
-Using "latest" version:
-
-```sh
-go get github.com/project/libname
-```
-
-Using a release tag:
-
-```sah
-go get github.com/project/[email protected]
-```
-
-Using a commit hash:
-
 ```sh
-go get github.com/project/libname@aee5cab1c
+go get -u github.com/project/libname  # Using "latest" version
+go get -u github.com/project/[email protected] # Using tagged version
+go get -u github.com/project/libname@aee5cab1c  # Using a commit hash
 ```
 
 ### Updating Go version

go.mod

@@ -1,26 +1,27 @@
 module github.com/apache/openwhisk-cli
 
-go 1.14
+go 1.15
 
 require (
-	github.com/apache/openwhisk-client-go v0.0.0-20200824013630-44551f1f3b71
-	github.com/apache/openwhisk-wskdeploy v0.0.0-20200827195556-535f5a9d3942
+	github.com/apache/openwhisk-client-go v0.0.0-20210308161059-5cd1006dc35f
+	github.com/apache/openwhisk-wskdeploy v0.0.0-20210305213302-f4f94e757f09
+	github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
-	github.com/fatih/color v1.9.0
+	github.com/fatih/color v1.10.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/hokaccha/go-prettyjson v0.0.0-20190818114111-108c894c2c0e // indirect
 	github.com/jteeuwen/go-bindata v3.0.7+incompatible // indirect
-	github.com/mattn/go-colorable v0.1.7
+	github.com/mattn/go-colorable v0.1.8
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nicksnyder/go-i18n v1.10.1
-	github.com/onsi/ginkgo v1.14.0
-	github.com/onsi/gomega v1.10.1
-	github.com/pelletier/go-toml v1.8.0 // indirect
-	github.com/spf13/cobra v1.0.0
+	github.com/onsi/ginkgo v1.15.0
+	github.com/onsi/gomega v1.10.5
+	github.com/pelletier/go-buffruneio v0.1.0 // indirect
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
-	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
+	github.com/ugorji/go v1.1.4 // indirect
+	github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect
+	golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )