X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=3a3f0bbae495a893ad3e0b76e0342c38c5b2210d;hb=e60196a7af4afcbb9d131dc242b4fdfe8face730;hp=4bf16d0bd34663ef4b5e4142504874f55c27ba35;hpb=adf139c32421cd278046b70608a7db0a4026dff2;p=civicrm-core.git

diff --git a/composer.json b/composer.json
index 4bf16d0bd3..3a3f0bbae4 100644
--- a/composer.json
+++ b/composer.json
@@ -47,27 +47,22 @@
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
     "zetacomponents/base": "1.9.*",
-    "zetacomponents/mail": "dev-1.8-civi",
+    "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",
-    "pear/log": "1.13.1"
+    "pear/log": "1.13.1",
+    "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",
@@ -93,6 +88,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"
       }
     }
   }