From e084a383acf05c9c5f567b944b2f32070bf649b1 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Tue, 27 Mar 2018 10:45:26 -0700 Subject: [PATCH] Master 4.2.0 release --- LICENSE | 4 ++-- README.md | 2 +- box.json | 2 +- examples/layouts/default.cfm | 2 +- framework/Application.cfc | 2 +- framework/MyApplication.cfc | 2 +- framework/WireBoxAdapter.cfc | 4 ++-- framework/aop.cfc | 4 ++-- framework/beanProxy.cfc | 4 ++-- framework/facade.cfc | 4 ++-- framework/ioc.cfc | 4 ++-- framework/methodProxy.cfc | 4 ++-- framework/one.cfc | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index 2c308fc1..64c4a4c9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2009-2017 Sean Corfield (see individual files for any - additional copyright holders) +Copyright (c) 2009-2018, Sean Corfield (see individual files for any + additional copyright holders) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index e900e9f7..30ccc2ef 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,6 @@ If you get any failures, you can run this with more verbose, but still compact o # Copyright and License -Copyright (c) 2009-2017 Sean Corfield (and others -- see individual files for additional copyright holders). All rights reserved. +Copyright (c) 2009-2018, Sean Corfield (and others -- see individual files for additional copyright holders). All rights reserved. The use and distribution terms for this software are covered by the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0) which can also be found in the file LICENSE at the root of this distribution and in individual licensed files. By using this software in any fashion, you are agreeing to be bound by the terms of this license. You must not remove this notice, or any other, from this software. diff --git a/box.json b/box.json index a865b875..36881a0e 100644 --- a/box.json +++ b/box.json @@ -1,7 +1,7 @@ { "name":"Framework One", "slug":"fw1", - "version":"4.2.0-SNAPSHOT", + "version":"4.2.0", "author":"Sean Corfield, Marcin Szczepanski, Ryan Cogswell", "location":"framework-one/fw1#develop", "createPackageDirectory":true, diff --git a/examples/layouts/default.cfm b/examples/layouts/default.cfm index c7bf3d39..69b5bb44 100644 --- a/examples/layouts/default.cfm +++ b/examples/layouts/default.cfm @@ -12,7 +12,7 @@

Examples Home

- FW/1 is copyright (c) 2009-2017 Sean Corfield, Marcin Szczepanski, Ryan Cogswell - + FW/1 is copyright (c) 2009-2018, Sean Corfield, Marcin Szczepanski, Ryan Cogswell - Licensed under the Apache License, Version 2.0
Logo by Kevan Stannard - You are running FW/1 version #variables.framework.version#.
diff --git a/framework/Application.cfc b/framework/Application.cfc index 3011aac2..ca615b05 100644 --- a/framework/Application.cfc +++ b/framework/Application.cfc @@ -1,5 +1,5 @@ component { - // Version: FW/1 4.2.0-SNAPSHOT + // Version: FW/1 4.2.0 // copy this to your application root to use as your Application.cfc // or incorporate the logic below into your existing Application.cfc diff --git a/framework/MyApplication.cfc b/framework/MyApplication.cfc index 928af9c2..d32f1cbc 100644 --- a/framework/MyApplication.cfc +++ b/framework/MyApplication.cfc @@ -1,5 +1,5 @@ component extends="framework.one" { - // Version: FW/1 4.2.0-SNAPSHOT + // Version: FW/1 4.2.0 // if you need to provide extension points, copy this to // your web root, next to your Application.cfc, and add diff --git a/framework/WireBoxAdapter.cfc b/framework/WireBoxAdapter.cfc index 406bdc28..4738a5aa 100644 --- a/framework/WireBoxAdapter.cfc +++ b/framework/WireBoxAdapter.cfc @@ -1,7 +1,7 @@ component extends="wirebox.system.ioc.Injector" { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; /* - Copyright (c) 2010-2017, Sean Corfield + Copyright (c) 2010-2018, Sean Corfield Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/aop.cfc b/framework/aop.cfc index 661c5878..b3910da8 100644 --- a/framework/aop.cfc +++ b/framework/aop.cfc @@ -1,8 +1,8 @@ component extends="framework.ioc" { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; variables._aop1_version = variables._fw1_version; /* - Copyright (c) 2013-2017, Mark Drew, Sean Corfield, Daniel Budde + Copyright (c) 2013-2018, Mark Drew, Sean Corfield, Daniel Budde Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/beanProxy.cfc b/framework/beanProxy.cfc index 2c9a9c4a..00cffb56 100644 --- a/framework/beanProxy.cfc +++ b/framework/beanProxy.cfc @@ -1,8 +1,8 @@ component { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; variables._aop1_version = variables._fw1_version; /* - Copyright (c) 2013-2017, Mark Drew, Sean Corfield, Daniel Budde + Copyright (c) 2013-2018, Mark Drew, Sean Corfield, Daniel Budde Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/facade.cfc b/framework/facade.cfc index b972d5f5..a2228a3e 100644 --- a/framework/facade.cfc +++ b/framework/facade.cfc @@ -1,7 +1,7 @@ component { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; /* - Copyright (c) 2016-2017, Sean Corfield + Copyright (c) 2016-2018, Sean Corfield Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/ioc.cfc b/framework/ioc.cfc index 15f0005a..767559e9 100644 --- a/framework/ioc.cfc +++ b/framework/ioc.cfc @@ -1,8 +1,8 @@ component { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; variables._di1_version = variables._fw1_version; /* - Copyright (c) 2010-2017, Sean Corfield + Copyright (c) 2010-2018, Sean Corfield Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/methodProxy.cfc b/framework/methodProxy.cfc index 6585d24b..905d362a 100644 --- a/framework/methodProxy.cfc +++ b/framework/methodProxy.cfc @@ -1,7 +1,7 @@ component { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; /* - Copyright (c) 2017, Sean Corfield + Copyright (c) 2018, Sean Corfield Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/framework/one.cfc b/framework/one.cfc index 29d38391..f2354f5d 100644 --- a/framework/one.cfc +++ b/framework/one.cfc @@ -1,7 +1,7 @@ component { - variables._fw1_version = "4.2.0-SNAPSHOT"; + variables._fw1_version = "4.2.0"; /* - Copyright (c) 2009-2017, Sean Corfield, Marcin Szczepanski, Ryan Cogswell + Copyright (c) 2009-2018, Sean Corfield, Marcin Szczepanski, Ryan Cogswell Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.