From dc4be58ca8e44f691a6086593a71d15841914a82 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 21 Mar 2013 16:37:04 +0100
Subject: [PATCH] Update dependencies

---
 composer.json | 25 +++++++++++++++++++++----
 composer.lock |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index bbfe6c9f25..a868d14ce6 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,7 @@
         "doctrine/orm"                     : "~2.3.0",
         "facebook/php-sdk"                 : "~3.0",
         "gedmo/doctrine-extensions"        : "~2.3.0",
+        "google-plus/api-client"           : "~0.6.1",
         "imagine/imagine"                  : "dev-ColorSpaces@dev",
         "jms/serializer"                   : "~0.10",
         "mediavorus/mediavorus"            : "~0.3",
@@ -33,18 +34,20 @@
         "swiftmailer/swiftmailer"          : "~4.3.0",
         "symfony/symfony"                  : "~2.2",
         "tecnick.com/tcpdf"                : "dev-master",
+        "themattharris/tmhoauth"           : "~0.7",
         "twig/twig"                        : "~1.12",
         "twig/extensions"                  : "~1.0",
         "zend/gdata"                       : "~1.12.1"
     },
     "require-dev": {
         "doctrine/data-fixtures"           : "dev-master",
+        "phpunit/phpunit"                  : "~3.7",
         "behat/behat"                      : "~2.4",
         "behat/mink"                       : "~1.4",
-        "behat/mink-extension"             : "*",
-        "behat/mink-goutte-driver"         : "*",
-        "behat/mink-selenium2-driver"      : "*",
-        "fabpot/goutte"                    : "1.0.x@dev"
+        "behat/mink-extension"             : "~1.0",
+        "behat/mink-goutte-driver"         : "~1.0",
+        "behat/mink-selenium2-driver"      : "~1.0",
+        "fabpot/goutte"                    : "~1.0"
     },
     "repositories": [
     {
@@ -55,6 +58,20 @@
         "type" : "git",
         "url"  : "https://github.com/winmillwill/BadFaith"
     },
+    {
+        "type": "package",
+        "package": {
+            "name": "google-plus/api-client",
+            "version": "0.6.1",
+            "dist": {
+                "url": "http://google-api-php-client.googlecode.com/files/google-api-php-client-0.6.1.tar.gz",
+                "type": "tar"
+            },
+            "autoload": {
+                "classmap": ["src/"]
+            }
+        }
+    },
     {
         "type" : "git",
         "url"  : "https://github.com/alchemy-fr/oauth2-php"
diff --git a/composer.lock b/composer.lock
index f68b46e6d6..f7631b2849 100644
--- a/composer.lock
+++ b/composer.lock
@@ -460,7 +460,7 @@
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],