From a4dad1e031dea9a2bd0bd0baad600aa14f734472 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Sun, 12 Jul 2015 19:53:17 -0700
Subject: [PATCH] Prep for 3.1.0 release

---
 examples/render/controllers/render.cfc | 3 ++-
 examples/todos/assets/todo.json        | 2 +-
 framework/WireBoxAdapter.cfc           | 2 +-
 framework/aop.cfc                      | 4 ++--
 framework/beanProxy.cfc                | 4 ++--
 framework/ioc.cfc                      | 4 ++--
 framework/one.cfc                      | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/render/controllers/render.cfc b/examples/render/controllers/render.cfc
index 592e8660..3be91c7d 100644
--- a/examples/render/controllers/render.cfc
+++ b/examples/render/controllers/render.cfc
@@ -19,7 +19,8 @@ component {
     }
 
     public void function jsonObject( struct rc ) {
-        variables.fw.renderData( 'json', [ "An", "array", { "containing" = "data" } ] );
+        // variables.fw.renderData( 'json', [ "An", "array", { "containing" = "data" } ] );
+        variables.fw.renderData( 'json', [], 200 );
     }
 
     public void function jsonString( struct rc ) {
diff --git a/examples/todos/assets/todo.json b/examples/todos/assets/todo.json
index 1c3c6178..91f9abb3 100644
--- a/examples/todos/assets/todo.json
+++ b/examples/todos/assets/todo.json
@@ -1 +1 @@
-{"6":{"status":"Complete","title":"Feed the cat"},"2":{"status":"Pending","title":"Clean the toilet"},"8":{"status":"Pending","title":"Vote in the elections"},"9":{"status":"New","title":"Test the new todos app"}}
\ No newline at end of file
+{"6":{"status":"Complete","title":"Feed the cat"},"2":{"status":"Pending","title":"Clean the toilet"},"8":{"status":"Pending","title":"Vote in the elections"},"9":{"status":"Pending","title":"Go to Pride!"}}
\ No newline at end of file
diff --git a/framework/WireBoxAdapter.cfc b/framework/WireBoxAdapter.cfc
index cb68eed1..303c603a 100644
--- a/framework/WireBoxAdapter.cfc
+++ b/framework/WireBoxAdapter.cfc
@@ -1,5 +1,5 @@
 component extends="wirebox.system.ioc.Injector" {
-    variables._fw1_version = "3.1.0-rc3";
+    variables._fw1_version = "3.1.0";
 /*
     Copyright (c) 2010-2015, Sean Corfield
 
diff --git a/framework/aop.cfc b/framework/aop.cfc
index 1fc87686..35673da9 100755
--- a/framework/aop.cfc
+++ b/framework/aop.cfc
@@ -1,6 +1,6 @@
 component extends="framework.ioc" {
-    variables._fw1_version = "3.1.0-rc3";
-    variables._aop1_version = "2.0.0-rc3";
+    variables._fw1_version = "3.1.0";
+    variables._aop1_version = "2.0.0";
 /*
 	Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
 
diff --git a/framework/beanProxy.cfc b/framework/beanProxy.cfc
index c83ab648..16f46697 100755
--- a/framework/beanProxy.cfc
+++ b/framework/beanProxy.cfc
@@ -1,6 +1,6 @@
 component {
-    variables._fw1_version = "3.1.0-rc3";
-    variables._aop1_version = "2.0.0-rc3";
+    variables._fw1_version = "3.1.0";
+    variables._aop1_version = "2.0.0";
 /*
 	Copyright (c) 2013-2015, Mark Drew, Sean Corfield, Daniel Budde
 
diff --git a/framework/ioc.cfc b/framework/ioc.cfc
index 4a1693ef..f1551178 100644
--- a/framework/ioc.cfc
+++ b/framework/ioc.cfc
@@ -1,6 +1,6 @@
 component {
-    variables._fw1_version = "3.1.0-rc3";
-    variables._di1_version = "1.1.0-rc3";
+    variables._fw1_version = "3.1.0";
+    variables._di1_version = "1.1.0";
 /*
     Copyright (c) 2010-2015, Sean Corfield
 
diff --git a/framework/one.cfc b/framework/one.cfc
index 115cfc17..7e6e1e77 100644
--- a/framework/one.cfc
+++ b/framework/one.cfc
@@ -1,5 +1,5 @@
 component {
-    variables._fw1_version = "3.1.0-rc3";
+    variables._fw1_version = "3.1.0";
 /*
     Copyright (c) 2009-2015, Sean Corfield, Marcin Szczepanski, Ryan Cogswell