From 0271a560b1029201f9a97dbb08ac721e45aab7d1 Mon Sep 17 00:00:00 2001
From: Fernando Ontiveros <fernando@colosa.com>
Date: Thu, 30 Jan 2014 06:23:28 -0400
Subject: [PATCH 1/3] changing composer.json to local composer server

---
 composer.json | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/composer.json b/composer.json
index 3e840153f..e77af7170 100644
--- a/composer.json
+++ b/composer.json
@@ -2,47 +2,25 @@
     "name": "processmaker/processmaker",
     "description": "BPM PHP Software",
     "keywords": ["php bpm processmaker"],
-    "homepage": "http://processmaker.com",
-    "license": "GNU Affero General Public License version 3",
+    "homepage": "http://www.processmaker.com",
+    "license": "AGPL-3.0",
 
     "repositories": [
         {
-            "type": "package",
-            "package": {
-                "name": "jquery/jquery",
-                "version": "1.10.2",
-                "dist": {
-                    "url": "http://code.jquery.com/jquery-1.10.2.min.js",
-                    "type": "file"
-                }
-            }
+            "packagist": false
         },
         {
-            "type": "package",
-            "package": {
-                "name": "underscore/underscore",
-                "version": "1.5.2",
-                "dist": {
-                    "url": "http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js",
-                    "type": "file"
-                }
-            }
-        },
-        {
-            "type": "vcs",
-            "url":  "git@bitbucket.org:colosa/pmUI.git"
-        },
-        {
-            "type": "vcs",
-            "url":  "git@bitbucket.org:colosa/MichelangeloFE.git"
+            "type": "composer",
+            "url": "http://composer.colosa.net/"
         }
     ],
-
     "require": {
+        "php":">=5.3.3",
+        "underscore/underscore": "1.5.2",
+        "jquery/jquery": "1.10.2",
         "luracast/restler" : "v3.0.0",
         "bshaffer/oauth2-server-php": "v1.0",
-        "jquery/jquery": "1.10.2",
-        "underscore/underscore": "1.5.2",
+        "colosa/restclient": "dev-master",
         "colosa/pmUI": "dev-master",
         "colosa/MichelangeloFE": "dev-master"
     },

From a53761ac5c40c31900383565e1ff7ccf7e865af4 Mon Sep 17 00:00:00 2001
From: Fernando Ontiveros <Fernando@colosa.com>
Date: Thu, 30 Jan 2014 09:09:29 -0400
Subject: [PATCH 2/3] composer.json points to our local composer servers

---
 composer.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index e77af7170..1efaa6009 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,10 @@
         {
             "packagist": false
         },
+        {
+            "type": "composer",
+            "url": "http://composer-public.colosa.net/"
+        },
         {
             "type": "composer",
             "url": "http://composer.colosa.net/"
@@ -20,12 +24,12 @@
         "jquery/jquery": "1.10.2",
         "luracast/restler" : "v3.0.0",
         "bshaffer/oauth2-server-php": "v1.0",
-        "colosa/restclient": "dev-master",
+        "colosa/restclient": "0.1.7",
         "colosa/pmUI": "dev-master",
-        "colosa/MichelangeloFE": "dev-master"
+        "colosa/MichelangeloFE": "dev-master",
+        "behat/behat":"2.4.6@stable"
     },
     "require-dev":{
-        "guzzle/guzzle":"~3.1.1",
-        "behat/behat":"2.4.*@stable"
+        "guzzle/guzzle":"~3.1.1"
     }
 }

From a63eb1794c2b7b18f76dd2c9bc535e53efb14305 Mon Sep 17 00:00:00 2001
From: Fernando Ontiveros <Fernando@colosa.com>
Date: Thu, 30 Jan 2014 09:17:54 -0400
Subject: [PATCH 3/3] composer.json to move behat vendor to require-dev section

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 1efaa6009..3a67c882f 100644
--- a/composer.json
+++ b/composer.json
@@ -26,10 +26,10 @@
         "bshaffer/oauth2-server-php": "v1.0",
         "colosa/restclient": "0.1.7",
         "colosa/pmUI": "dev-master",
-        "colosa/MichelangeloFE": "dev-master",
-        "behat/behat":"2.4.6@stable"
+        "colosa/MichelangeloFE": "dev-master"
     },
     "require-dev":{
-        "guzzle/guzzle":"~3.1.1"
+        "guzzle/guzzle":"~3.1.1",
+        "behat/behat":"2.4.6@stable"
     }
 }