X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=bdbf553c4a607c5dc91284cdd18305cf9087f75b;hb=4d198431aee73c190cff826a0dc3e5e72f6a4a30;hp=0a2bb8786f40056bd3f93bada35d44cbbbf54bd5;hpb=bf25ef1fcc37fa6bec9e0bd5607fca980fb32433;p=civicrm-core.git

diff --git a/composer.json b/composer.json
index 0a2bb8786f..bdbf553c4a 100644
--- a/composer.json
+++ b/composer.json
@@ -46,27 +46,24 @@
     "symfony/finder": "^2.8.44 || ~3.0",
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
-    "zetacomponents/base": "1.7.*",
-    "zetacomponents/mail": "dev-1.7-civi",
+    "zetacomponents/base": "1.9.*",
+    "zetacomponents/mail": "dev-master",
     "marcj/topsort": "~1.1",
     "phpoffice/phpword": "^0.15.0",
-    "pear/Validate_Finance_CreditCard": "dev-master",
+    "pear/validate_finance_creditcard": "dev-master",
     "civicrm/civicrm-cxn-rpc": "~0.19.01.08",
-    "pear/Auth_SASL": "1.1.0",
-    "pear/Net_SMTP": "1.6.*",
-    "pear/Net_socket": "1.0.*",
+    "pear/auth_sasl": "1.1.0",
+    "pear/net_smtp": "1.6.*",
+    "pear/net_socket": "1.0.*",
     "pear/mail": "^1.4",
     "civicrm/civicrm-setup": "~0.2.0",
     "guzzlehttp/guzzle": "^6.3",
     "psr/simple-cache": "~1.0.1",
-    "cweagans/composer-patches": "~1.0"
+    "cweagans/composer-patches": "~1.0",
+    "pear/log": "1.13.1",
+    "ezyang/htmlpurifier": "4.10",
+    "katzien/php-mime-type": "2.1.0"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/civicrm/zetacomponents-mail.git"
-    }
-  ],
   "scripts": {
     "post-install-cmd": [
       "bash tools/scripts/composer/dompdf-cleanup.sh",
@@ -92,6 +89,9 @@
       },
       "phpoffice/phpword": {
         "Fix handling of libxml_disable_entity_loader": "tools/scripts/composer/patches/phpword-libxml-fix-global-handling.patch"
+      },
+      "zetacomponents/mail": {
+        "CiviCRM Custom Patches for ZetaCompoents mail": "tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
       }
     }
   }