Merge pull request #21382 from mattwire/collate

[civicrm-core.git] / composer.json

diff --git a/composer.json b/composer.json
index f85058e579a1930b42b6c8578f895dfc55abfe95..ea5bd62ff2faf3db9fb227aaabeae176fd47d71e 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -83,7 +83,7 @@
     "brick/money": "~0.4",
     "ext-intl": "*",
     "pear/mail_mime": "~1.10",
-    "pear/db": "1.10",
+    "pear/db": "1.11",
     "civicrm/composer-compile-lib": "~0.3 || ~1.0",
     "ext-json": "*"
   },
@@ -136,8 +136,8 @@
         "url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip"
       },
       "angular-file-upload": {
-        "url": "https://github.com/nervgh/angular-file-upload/archive/v1.1.6.zip",
-        "ignore": ["examples"]
+        "url": "https://github.com/nervgh/angular-file-upload/archive/2.6.1.zip",
+        "ignore": ["examples", "src"]
       },
       "angular-jquery-dialog-service": {
         "url": "https://github.com/totten/angular-jquery-dialog-service/archive/v0.8.0-civicrm-1.0.zip"
@@ -170,7 +170,7 @@
         "ignore": [".*", "node_modules", "docs", "Gruntfile.js", "index.html", "package.json", "test"]
       },
       "ckeditor": {
-        "url": "https://github.com/ckeditor/ckeditor-releases/archive/4.16.1.zip"
+        "url": "https://github.com/ckeditor/ckeditor-releases/archive/4.16.2.zip"
       },
       "crossfilter-1.3.x": {
         "url": "https://github.com/crossfilter/crossfilter/archive/1.3.14.zip",
@@ -274,7 +274,7 @@
         "PHP7.4 Fix for array access using {} instead of []": "https://raw.githubusercontent.com/civicrm/civicrm-core/fe45bdfc4f3e3d3deb27e3d853cdbc7f616620a9/tools/scripts/composer/patches/php74_array_access_fix_phpquery.patch"
       },
       "pear/db": {
-        "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/a48a43c2b5f6d694fff1cfb99d522c5d9e2459a0/tools/scripts/composer/pear_db_civicrm_changes.patch"
+        "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
       },
       "pear/mail": {
         "Apply CiviCRM Customisations for CRM-1367 and CRM-5946": "https://raw.githubusercontent.com/civicrm/civicrm-core/36319938a5bf26c1e7e2110a26a65db6a5979268/tools/scripts/composer/patches/pear-mail.patch"