Merge pull request #6790 from akeneo/prepare-20-release

Prepare 2.0 release
akeneo · Sep 23, 2017 · 6e2bb9e · 6e2bb9e
2 parents c11f1f2 + 1cc9c73
commit 6e2bb9e
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 6 deletions.
diff --git 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 → UPGRADE-2.0.md b/UPGRADE-1.8.md → UPGRADE-2.0.md
@@ -1,4 +1,4 @@
-# UPGRADE FROM 1.7 to 1.8
+# UPGRADE FROM 1.7 to 2.0
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

diff --git 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
@@ -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
@@ -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';

diff --git a/...issing_set_attribute_requirements_job.php → ...issing_set_attribute_requirements_job.php b/...issing_set_attribute_requirements_job.php → ...issing_set_attribute_requirements_job.php
diff --git a/...db_index_on_product_values_options_id.php → ...db_index_on_product_values_options_id.php b/...db_index_on_product_values_options_id.php → ...db_index_on_product_values_options_id.php
diff --git a/...0504175205_clean_attribute_properties.php → ...0504175205_clean_attribute_properties.php b/...0504175205_clean_attribute_properties.php → ...0504175205_clean_attribute_properties.php
diff --git a/...des/schema/Version_1_8_20170404125715.php → ...es/1.7-2.0/Version_1_8_20170404125715.php b/...des/schema/Version_1_8_20170404125715.php → ...es/1.7-2.0/Version_1_8_20170404125715.php
diff --git a/...2627_add_client_in_access_token_table.php → ...2627_add_client_in_access_token_table.php b/...2627_add_client_in_access_token_table.php → ...2627_add_client_in_access_token_table.php
diff --git a/..._8_20170823082403_udapte_client_label.php → ..._8_20170823082403_udapte_client_label.php b/..._8_20170823082403_udapte_client_label.php → ..._8_20170823082403_udapte_client_label.php