Merge branch 'main' into anujc/it-test-validation

Author: anujc25

.github/CONTRIBUTING.md

@@ -10,8 +10,8 @@ mailing list.
 The cf CLI follows a branching model:
 - V9 (Next major release) of the cf CLI is built from the [main branch](https://github.com/cloudfoundry/cli/tree/main). **This branch is under active development**.
 - V8 of the cf CLI is built from the [v8 branch](https://github.com/cloudfoundry/cli/tree/v8). **This branch is under active development**.
-- V7 of the cf CLI is built from the [v7 branch](https://github.com/cloudfoundry/cli/tree/v7). **This branch is maintenance only** and will only be updated to patch CVEs and very severe blocking defects.
-- V6 of the cf CLI is built from the [v6 branch](https://github.com/cloudfoundry/cli/tree/v6). **This branch is maintenance only** and will only be updated to patch CVEs and very severe blocking defects.
+- V7 of the cf CLI is built from the [v7 branch](https://github.com/cloudfoundry/cli/tree/v7). **This branch is no longer maintained**.
+- V6 of the cf CLI is built from the [v6 branch](https://github.com/cloudfoundry/cli/tree/v6). **This branch is no longer maintained**.
 
 ## Prerequisites
 Before working on a PR to the CLI code base, please:
@@ -33,11 +33,11 @@ After reaching out to the CLI team and the conclusion is to make a PR, please fo
    [Product Style Guide](https://github.com/cloudfoundry/cli/wiki/CLI-Product-Specific-Style-Guide),
    and [Internationalization Guide](https://github.com/cloudfoundry/cli/wiki/Internationalization-Guide).
 1. Fork the project repository.
-1. Create a feature branch from the earliest branch that's [appropriate for your change](#cli-versions) (e.g. `git checkout v7 && git checkout -b better_cli`) and make changes on this branch
+1. Create a feature branch from the earliest branch that's [appropriate for your change](#cli-versions) (e.g. `git checkout v8 && git checkout -b better_cli`) and make changes on this branch
    * Follow the other sections on this page to [set up your development environment](#development-environment-setup), [build `cf`](#building-the-cf-binary) and [run the tests](#testing).
    * Tests are required for any changes.
 1. Push to your fork (e.g. `git push origin better_cli`) and [submit a pull request](https://help.github.com/articles/creating-a-pull-request)
-1. The cf CLI team will merge your changes from the versioned branch (e.g. v7) to main for you after the PR is merged.
+1. The cf CLI team will merge your changes from the versioned branch (e.g. v8) to main for you after the PR is merged.
 
 Note: All contributions must be sent using GitHub Pull Requests.
 We prefer a small, focused pull request with a clear message

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,9 +32,8 @@ Steps to reproduce the behavior; include the exact CLI commands and verbose outp
 - version of the CC API Release you are on
 
 **Notes regarding V6 and V7 CLI support:** 
-- V6:
-  - Minimum supported version of CF Deployment: v7.0.0 (CAPI Release: 1.74.0 (APIs 2.128.0 and 3.63.0))
-  - Maximum supported version of CF Deployment: v13.4.0 (CAPI Release: 1.94.0 (APIs 2.149.0 and 3.84.0))
-- V7:
-  - Minimum supported version of CF Deployment: v13.5.0 (CAPI Release: 1.95.0 (APIs 2.150.0 and 3.85.0))
+- V6: **No longer maintained or released**
+  - Last supported version of CF Deployment: v13.4.0 (CAPI Release: 1.94.0 (APIs 2.149.0 and 3.84.0))
+- V7: **No longer maintained or released**
+  - Last supported version of CF Deployment: v13.5.0 (CAPI Release: 1.95.0 (APIs 2.150.0 and 3.85.0))
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -31,4 +31,4 @@ A clear and concise description of any alternative solutions or features you've
 Add any other context or screenshots about the feature request here.
 
 **Note:**
-As of the GA of the v7 CLI, the v6 line is no longer under active development and will be updated only to patch CVEs or fix severe blocking defects with no workarounds.
+The v7 and v6 CLI versions are no longer maintained.

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ If your contribution falls under a company CLA but your membership is not public
 * Contributions must conform to our [style guide](https://github.com/cloudfoundry/cli/wiki/CLI-Product-Specific-Style-Guide). Please reach out to us if you have questions.
 
 
-#### Note: Please create separate PR for every branch (main, v8 and v7) as needed.
+#### Note: Please create separate PR for every branch (main and v8) as needed.
 
 ## Description of the Change
 

README.md

@@ -35,12 +35,13 @@ CF CLI Binary Download Server's uptime:
 
 ***
 ## Getting Started
-Download and install the cf CLI from the [Downloads Section](#downloads) for either the [v8 cf CLI](https://github.com/cloudfoundry/cli/wiki/V8-CLI-Installation-Guide) or the [v7 cf CLI](https://github.com/cloudfoundry/cli/wiki/V7-CLI-Installation-Guide).
+Download and install the cf CLI from the [Downloads Section](#downloads) for the [v8 cf CLI](https://github.com/cloudfoundry/cli/wiki/V8-CLI-Installation-Guide).
 
 Once installed, you can log in and push an app.
-There are now three supported versions of the cf CLI:
+The currently supported version of the cf CLI:
 1. The v8 cf CLI is backed by the [v3 CC API](http://v3-apidocs.cloudfoundry.org/version/3.85.0/) (with the exception of plugins). See [our v8 documentation](https://docs.cloudfoundry.org/cf-cli/v8.html) for more information.
-1. The v7 cf CLI is backed by the [v3 CC API](http://v3-apidocs.cloudfoundry.org/version/3.85.0/) (with the exception of plugins). See [our v7 documentation](https://docs.cloudfoundry.org/cf-cli/v7.html) for more information.
+
+**Note**: v7 and v6 CLI versions are no longer maintained or released.
 
 View our [CLI v7 & v8 Versioning and Support Policy](https://github.com/cloudfoundry/cli/wiki/Versioning-and-Support-Policy) documentation.
 
@@ -61,8 +62,8 @@ Check out our [community contributed CLI plugins](https://plugins.cloudfoundry.o
 ## Downloads
 
 ### Installation instructions
-- [Install V7](https://github.com/cloudfoundry/cli/wiki/V7-CLI-Installation-Guide)
 - [Install V8](https://github.com/cloudfoundry/cli/wiki/V8-CLI-Installation-Guide)
+- [Install V7](https://github.com/cloudfoundry/cli/wiki/V7-CLI-Installation-Guide) (**DEPRECATED** - no longer maintained)
 - [Switching Between Multiple Versions](https://github.com/cloudfoundry/cli/wiki/Version-Switching-Guide)
 
 ## Known Issues

doc/installation-instructions/installation-instructions-v6.md

@@ -1,5 +1,7 @@
 ### Downloading the latest V6 CF CLI
 
+**DEPRECATED**: The v6 CF CLI is no longer maintained or released. Please consider upgrading to v8 or later versions. This documentation is kept for historical reference only.
+
 #### Installing using a package manager
 
 **Mac OS X** and **Linux** using [Homebrew](https://brew.sh/) via the [cloudfoundry tap](https://github.com/cloudfoundry/homebrew-tap):

doc/installation-instructions/installation-instructions-v7.md

@@ -1,5 +1,7 @@
 ### Downloading the latest V7 CF CLI
 
+**DEPRECATED**: The v7 CF CLI is no longer maintained or released. Please consider upgrading to v8 or later versions. This documentation is kept for historical reference only.
+
 **Important Note**: The v7 CF CLI is now GA and the binary has been renamed from `cf7` to `cf`. If you're already using the v7 CLI in parallel to the v6 CLI, you may need to change your workflow to accomodate the binary name change. See the [Version Switching](#version-switching) section for instructions. For more information and general status on the v7 CLI, please check [releases](https://github.com/cloudfoundry/cli/releases).
 
 #### Compatibility