From 451f9cc630733ebf548cce24f08e808c8293ff76 Mon Sep 17 00:00:00 2001 From: Nicolas Dupont Date: Sat, 23 Sep 2017 14:14:28 +0200 Subject: [PATCH] Prepare 2.0 release --- README.md | 2 +- UPGRADE-1.8.md => UPGRADE-2.0.md | 2 +- composer.json | 2 +- package.json | 2 +- src/Pim/Bundle/CatalogBundle/Version.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename UPGRADE-1.8.md => UPGRADE-2.0.md (99%) diff --git a/README.md b/README.md index f2ca94390efb..8ff1366645cf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Akeneo PIM Application Welcome to Akeneo PIM Product. This repository is used to develop the Akeneo PIM product. -Practically, it means the Akeneo PIM bundles are present in the src/ directory. +Practically, it means the Akeneo PIM core source code is present in the src/ directory. **If you want to create a new PIM project based on Akeneo PIM, please use http://www.github.com/akeneo/pim-community-standard** diff --git a/UPGRADE-1.8.md b/UPGRADE-2.0.md similarity index 99% rename from UPGRADE-1.8.md rename to UPGRADE-2.0.md index 61e9143f875c..7b19bd5cc523 100644 --- a/UPGRADE-1.8.md +++ b/UPGRADE-2.0.md @@ -1,4 +1,4 @@ -# UPGRADE FROM 1.7 to 1.8 +# UPGRADE FROM 1.7 to 2.0 diff --git a/composer.json b/composer.json index c2e94362ad90..c9343ed68239 100644 --- a/composer.json +++ b/composer.json @@ -145,7 +145,7 @@ } }, "branch-alias": { - "dev-master": "1.8.x-dev", + "dev-master": "2.0.x-dev", "dev-1.7": "1.7.x-dev", "dev-1.6": "1.6.x-dev", "dev-1.5": "1.5.x-dev", diff --git a/package.json b/package.json index 81179c8a1212..368e80d16144 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pim-community-dev", - "version": "1.8.0", + "version": "2.0.0", "description": "Akeneo PIM Application", "homepage": "http://www.akeneo.com", "scripts": { diff --git a/src/Pim/Bundle/CatalogBundle/Version.php b/src/Pim/Bundle/CatalogBundle/Version.php index c31aba3a1e41..9208b8c30c38 100644 --- a/src/Pim/Bundle/CatalogBundle/Version.php +++ b/src/Pim/Bundle/CatalogBundle/Version.php @@ -12,10 +12,10 @@ class Version { /** @staticvar string */ - const VERSION = '1.7.8'; + const VERSION = '2.0.0-alpha1'; /** @staticvar string */ - const VERSION_CODENAME = 'The Old Grey Hare'; + const VERSION_CODENAME = ''; /** @staticvar string */ const EDITION = 'CE';