[Composer] Set metarepo branch for tests and requirements for master …

…branch
ezsystems · Jul 16, 2020 · 121f226 · 121f226
1 parent 255d699
commit 121f226
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "ext-libxml": "*",
         "ext-simplexml": "*",
         "ext-xmlwriter": "*",
-        "ezsystems/ezplatform-kernel": "~1.1.0@dev",
+        "ezsystems/ezplatform-kernel": "^1.2@dev",
         "symfony/http-kernel": "^5.0",
         "symfony/dependency-injection": "^5.0",
         "symfony/routing": "^5.0",
@@ -46,10 +46,10 @@
         "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
     },
     "extra": {
-        "_ezplatform_branch_for_behat_tests": "3.1",
+        "_ezplatform_branch_for_behat_tests": "master",
         "branch-alias": {
-            "dev-tmp_ci_branch": "1.1.x-dev",
-            "dev-master": "1.1.x-dev"
+            "dev-tmp_ci_branch": "1.2.x-dev",
+            "dev-master": "1.2.x-dev"
         }
     }
 }