Merge branch '1.0' of https://github.com/magento/magento-cloud-patches into MAGECLOUD-5215

� Conflicts:
�	composer.json

Author: shiftedreality

composer.json

@@ -2,18 +2,21 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": "OSL-3.0",
     "require": {
         "php": "^7.0",
         "ext-json": "*",
         "composer/composer": "@stable",
         "composer/semver": "^1.5",
-        "symfony/config": "^3.3||^4.3",
-        "symfony/console": "^2.6||^4.0",
+        "symfony/config": "^3.3||^4.4",
+        "symfony/console": "^2.8||^4.0",
         "symfony/dependency-injection": "^3.3||^4.3",
         "symfony/process": "^2.1||^4.1"
     },
+    "conflict": {
+        "symfony/process": "^4.2"
+    },
     "require-dev": {
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "^6.2",

patches.json

@@ -43,7 +43,6 @@
       "2.2.0": "MDVA-8695__properly_encode_characters_in_emails__2.1.4.patch"
     },
     "Enable SCD on demand in production": {
-      ">=2.1.4": "MAGECLOUD-1601__trim_static_content_path__2.1.4.patch",
       "~2.1.4": "MAGECLOUD-1601__configure_scd_on_demand_for_cloud__2.1.4.patch",
       "2.2.0 - 2.2.3": "MAGECLOUD-1601__configure_scd_on_demand_for_cloud__2.2.0.patch"
     },
@@ -60,6 +59,15 @@
       "2.2.2 - 2.2.3": "MAGECLOUD-1607__overhaul_cron_implementation__2.2.2.patch",
       "2.2.4": "MAGECLOUD-1607__overhaul_cron_implementation__2.2.4.patch"
     },
+    "Fix cron deadlocks and improve cron locking": {
+      "2.2.5 - 2.2.8": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.2.5.patch",
+      "2.2.9": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.2.9.patch",
+      ">=2.2.10 <2.3.0": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.2.10.patch",
+      "2.3.0": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.0.patch",
+      "2.3.1": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.1.patch",
+      ">=2.3.2 <2.3.3": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.2.patch",
+      ">=2.3.3 <2.3.5": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.3.patch"
+    },
     "Add Zookeeper and flock locks": {
       "2.2.5 - 2.2.8": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.2.5.patch",
       "2.3.0 - 2.3.1": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.3.0.patch"
@@ -202,12 +210,6 @@
       "2.3.1": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.1.patch",
       ">=2.3.2 <2.3.4": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.2.patch"
     },
-    "Fix pagebuilder module": {
-      "2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",
-      "2.3.2": "PB-320__fix_pagebuilder_module__2.3.2.patch",
-      ">=2.3.2-p1 <2.3.3": "PB-322__fix_pagebuilder_module__2.3.2-p1.patch",
-      "2.3.3": "PB-323__fix_pagebuilder_module__2.3.3.patch"
-    },
     "Fix XSS in order history": {
       "2.2.0 - 2.2.6": "PRODSECBUG-2233__fix_xss_in_order_history__2.2.0.patch",
       "2.2.7 - 2.2.8": "PRODSECBUG-2233__fix_xss_in_order_history__2.2.7.patch",
@@ -287,5 +289,13 @@
     "Fix wrong namespace": {
       "3.2.0": "MAGECLOUD-4407__fix_namespace_vertex_tax__3.2.0.patch"
     }
+  },
+  "magento/magento2-ee-base": {
+    "Fix pagebuilder module": {
+      "2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",
+      "2.3.2": "PB-320__fix_pagebuilder_module__2.3.2.patch",
+      ">=2.3.2-p1 <2.3.3": "PB-322__fix_pagebuilder_module__2.3.2-p1.patch",
+      "2.3.3": "PB-323__fix_pagebuilder_module__2.3.3.patch"
+    }
   }
 }