From c32da3d10bfbd2c5d11b6d91f3f638a9e5921673 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Mon, 18 Jul 2016 13:23:59 -0400
Subject: [PATCH] Amazon composer version adjustment due to packagist error.
Conflicts:
composer.json
---
composer.json | 76 +++++++++++++++++++++++++++------------------------
1 file changed, 41 insertions(+), 35 deletions(-)
diff --git a/composer.json b/composer.json
index 9316210c35c..10946e1864f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,41 @@
-{
- "name": "vufind/vufind",
- "description": "A flexible discovery layer.",
- "authors": [
- {
- "name": "Demian Katz",
- "email": "demian.katz@villanova.edu"
- }
- ],
- "license": "GPL-2.0",
- "require": {
- "aferrandini/phpqrcode": "1.0.1",
- "jasig/phpcas": "1.3.3",
- "cap60552/php-sip2": "1.0.0",
- "los/losrecaptcha": "1.0.0",
- "ahand/mobileesp": "dev-master",
- "ocramius/proxy-manager": "1.0.2",
- "oyejorge/less.php": "1.7.0.9",
- "pear/file_marc": "1.1.2",
- "pear/validate_ispn": "dev-master",
- "serialssolutions/summon": "1.0.0",
- "symfony/yaml": "2.7.6",
- "vufind-org/vufindcode": "1.0.2",
- "vufind-org/vufindhttp": "2.0.0",
- "zendframework/zendframework": "2.4.6",
- "zendframework/zendrest": "2.0.2",
- "zendframework/zendservice-amazon": "2.0.4",
- "zf-commons/zfc-rbac": "2.5.2"
- },
- "require-dev": {
- "behat/mink": "1.7.0",
- "behat/mink-selenium2-driver": "1.3.0",
- "behat/mink-zombie-driver": "1.3.0"
- }
-}
+{
+ "name": "vufind/vufind",
+ "description": "A flexible discovery layer.",
+ "authors": [
+ {
+ "name": "Demian Katz",
+ "email": "demian.katz@villanova.edu"
+ }
+ ],
+ "license": "GPL-2.0",
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/zendframework/zendservice_amazon"
+ }
+ ],
+ "require": {
+ "aferrandini/phpqrcode": "1.0.1",
+ "jasig/phpcas": "1.3.3",
+ "cap60552/php-sip2": "1.0.0",
+ "los/losrecaptcha": "1.0.0",
+ "ahand/mobileesp": "dev-master",
+ "ocramius/proxy-manager": "1.0.2",
+ "oyejorge/less.php": "1.7.0.9",
+ "pear/file_marc": "1.1.2",
+ "pear/validate_ispn": "dev-master",
+ "serialssolutions/summon": "1.0.0",
+ "symfony/yaml": "2.7.6",
+ "vufind-org/vufindcode": "1.0.2",
+ "vufind-org/vufindhttp": "2.0.0",
+ "zendframework/zendframework": "2.4.6",
+ "zendframework/zendrest": "2.0.2",
+ "zendframework/zendservice-amazon": "2.0.4",
+ "zf-commons/zfc-rbac": "2.5.2"
+ },
+ "require-dev": {
+ "behat/mink": "1.7.0",
+ "behat/mink-selenium2-driver": "1.3.0",
+ "behat/mink-zombie-driver": "1.3.0"
+ }
+}
--
GitLab