From 8954a3557846d3936889ab31740c2565e777fc4a Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Thu, 18 May 2017 14:55:33 +0100 Subject: [PATCH 1/3] version support --- 2.0/docs/{switch => version}/1_5.md | 0 2.0/docs/{switch => version}/2_0.md | 0 2.0/docs/version/support.md | 28 ++++++++++++++++++++++++++++ 2.0/mkdocs.yml | 5 +++-- 4 files changed, 31 insertions(+), 2 deletions(-) rename 2.0/docs/{switch => version}/1_5.md (100%) rename 2.0/docs/{switch => version}/2_0.md (100%) create mode 100644 2.0/docs/version/support.md diff --git a/2.0/docs/switch/1_5.md b/2.0/docs/version/1_5.md similarity index 100% rename from 2.0/docs/switch/1_5.md rename to 2.0/docs/version/1_5.md diff --git a/2.0/docs/switch/2_0.md b/2.0/docs/version/2_0.md similarity index 100% rename from 2.0/docs/switch/2_0.md rename to 2.0/docs/version/2_0.md diff --git a/2.0/docs/version/support.md b/2.0/docs/version/support.md new file mode 100644 index 00000000..8eb276f1 --- /dev/null +++ b/2.0/docs/version/support.md @@ -0,0 +1,28 @@ +# Version Support + +![Support Matrix](https://cloud.githubusercontent.com/assets/1342803/26204807/ca86b23c-3bd7-11e7-83cb-fbafac2e90d5.png) + +Vapor 2.0 is currently active. +Vapor 1.5 is being maintained until November 2017. + +## Core + +All packages in the [Vapor GitHub](https://github.com/vapor) are maintained according to the following rules. + +### Active + +While a version is active, reported security issues and bugs are fixed. + +Additionally, new features and optimizations may be added. If new API is added, the minor version number will be incremented. At no point can existing API be removed or broken during an active version. Semver is strictly followed and tested. + +### Maintenance + +When a new version of Vapor is released, the previous version will enter a maintenance phase which lasts for six months. During this phase critical security issues and bugs will be fixed. No new features will be added. + +### Unstable + +The master branch is the latest development version of Vapor and is constantly changing. Before a new version of Vapor is released, there may be unstable alpha and beta phases in which you are welcome to test and provide feedback on the changes. + +## Community + +All packages in the [Vapor Community GitHub](https://github.com/vapor-community) are maintained in strict accordance of semver. Violations of semver should be reported as issues to the offending package's GitHub page. \ No newline at end of file diff --git a/2.0/mkdocs.yml b/2.0/mkdocs.yml index e97e7a1c..08091542 100644 --- a/2.0/mkdocs.yml +++ b/2.0/mkdocs.yml @@ -86,8 +86,9 @@ pages: - Advanced: - 'Modules': 'advanced/modules.md' - Version (2.0): - - '1.5': 'switch/1_5.md' - - '2.0': 'switch/2_0.md' + - '1.5': 'version/1_5.md' + - '2.0': 'version/2_0.md' + - 'Support': 'version/support.md' markdown_extensions: - admonition From 435f4308af5641ee6f09942982c109343a5da026 Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Thu, 18 May 2017 15:18:19 +0100 Subject: [PATCH 2/3] minor version support tweaks --- 2.0/docs/version/support.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/2.0/docs/version/support.md b/2.0/docs/version/support.md index 8eb276f1..365f6efa 100644 --- a/2.0/docs/version/support.md +++ b/2.0/docs/version/support.md @@ -1,10 +1,14 @@ # Version Support -![Support Matrix](https://cloud.githubusercontent.com/assets/1342803/26204807/ca86b23c-3bd7-11e7-83cb-fbafac2e90d5.png) +![Support Matrix](https://cloud.githubusercontent.com/assets/1342803/26206235/24c6ebb4-3bdc-11e7-9cea-1405030f20b0.png) Vapor 2.0 is currently active. Vapor 1.5 is being maintained until November 2017. +!!! warning + Dashed blocks and lines represent the team's goals and are not yet guaranteed. + Vapor 3's release and the beginning of Vapor 2's maintenance phase have not yet been decided. + ## Core All packages in the [Vapor GitHub](https://github.com/vapor) are maintained according to the following rules. @@ -17,7 +21,7 @@ Additionally, new features and optimizations may be added. If new API is added, ### Maintenance -When a new version of Vapor is released, the previous version will enter a maintenance phase which lasts for six months. During this phase critical security issues and bugs will be fixed. No new features will be added. +When a new version of Vapor is released, the previous version will enter a maintenance phase which lasts for six months. During this phase, critical security issues and bugs will be fixed. No new features will be added. ### Unstable From 78de61254489c9fb0a79e49103ffdbed36b084f9 Mon Sep 17 00:00:00 2001 From: tanner0101 Date: Thu, 18 May 2017 15:20:20 +0100 Subject: [PATCH 3/3] latest minor version note --- 2.0/docs/version/support.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/2.0/docs/version/support.md b/2.0/docs/version/support.md index 365f6efa..3eb2782d 100644 --- a/2.0/docs/version/support.md +++ b/2.0/docs/version/support.md @@ -23,6 +23,9 @@ Additionally, new features and optimizations may be added. If new API is added, When a new version of Vapor is released, the previous version will enter a maintenance phase which lasts for six months. During this phase, critical security issues and bugs will be fixed. No new features will be added. +!!! note + Only the latest minor version will be maintained. + ### Unstable The master branch is the latest development version of Vapor and is constantly changing. Before a new version of Vapor is released, there may be unstable alpha and beta phases in which you are welcome to test and provide feedback on the changes.