From 6a9ca7037a362731a7e90c8e3bded72ae2479649 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 26 Dec 2019 15:58:02 -0600 Subject: [PATCH] 2.0.0 readiness - Updates branch aliases: - dev-master => 2.0.x-dev - dev-develop => 2.1.x-dev - Sets release date for 2.0.0 in CHANGELOG --- CHANGELOG.md | 2 +- composer.json | 4 ++-- composer.lock | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb054e5..164e90b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.0.0 - TBD +## 2.0.0 - 2019-12-26 ### Added diff --git a/composer.json b/composer.json index 59d2891..02c9609 100644 --- a/composer.json +++ b/composer.json @@ -54,8 +54,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.3.x-dev", - "dev-develop": "2.0.x-dev" + "dev-master": "2.0.x-dev", + "dev-develop": "2.1.x-dev" }, "zf": { "module": "ZendDeveloperTools" diff --git a/composer.lock b/composer.lock index bf84c69..0546f3d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c2f88e841f172ac9bd2ab7caacb786f5", + "content-hash": "a0dd8b9f878020f5327822fc83c6620d", "packages": [ { "name": "container-interop/container-interop", @@ -1788,6 +1788,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2018-04-11T04:50:36+00:00" }, {