Skip to content

Commit

Permalink
Master 4.2.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
seancorfield committed Mar 27, 2018
1 parent 4b58c15 commit e084a38
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion examples/layouts/default.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<p><a href="<cfoutput>#buildURL( ':main.default' )#</cfoutput>">Examples Home</a></p>
</div>
<div class="footer">
<a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-2017 Sean Corfield, Marcin Szczepanski, Ryan Cogswell -
<a href="https://github.com/framework-one/fw1">FW/1</a> is copyright (c) 2009-2018, Sean Corfield, Marcin Szczepanski, Ryan Cogswell -
<a href="http://www.apache.org/licenses/LICENSE-2.0">Licensed under the Apache License, Version 2.0</a><br />
Logo by Kevan Stannard - You are running FW/1 version <cfoutput>#variables.framework.version#</cfoutput>.
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/Application.cfc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion framework/MyApplication.cfc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions framework/WireBoxAdapter.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions framework/aop.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions framework/beanProxy.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions framework/facade.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions framework/ioc.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions framework/methodProxy.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions framework/one.cfc
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit e084a38

Please sign in to comment.