usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [1/2] git commit: Permissive license notices should go in license file.
Date Wed, 03 Sep 2014 12:56:46 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/master 8efa278b5 -> ac68da74f


Permissive license notices should go in license file.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e433064b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e433064b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e433064b

Branch: refs/heads/master
Commit: e433064bd079ef9644d117752c076c566d4cb41f
Parents: 8efa278
Author: Dave Johnson <snoopdave@apache.org>
Authored: Wed Sep 3 08:48:56 2014 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Wed Sep 3 08:48:56 2014 -0400

----------------------------------------------------------------------
 LICENSE | 28 ++++++++++++++++++++++++++++
 NOTICE  | 33 +++------------------------------
 2 files changed, 31 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e433064b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 9fc77ee..1d90c5c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -263,3 +263,31 @@ For the SSKeychain component:
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product bundles SBJson, which is available under a "3-clause BSD" license.
+For details, see sdks/ios/UGAPI/SBJson/ .
+
+This product bundles SSKeychain, which is available under a "MIT/X11" license.
+For details, see sdks/ios/UGAPI/SSKeychain/.
+
+This product bundles angular-senario.js, part of jQuery JavaScript Library v1.10.2
+which Includes Sizzle.js Copyright 2005, 2013 jQuery Foundation, Inc. and
+other contributors. Released under the MIT license.
+
+This product bundles angular.js, specifically AngularJS v1.2.5 (c) 2010-2014
+Google, Inc. Released under the MIT license.
+
+This product bundles Bootstrap v2.3.2 Copyright 2012 Twitter, Inc
+Licensed under the Apache License v2.0
+
+This product bundles jquery-ui-1.8.9. Licensed under MIT license.
+
+This product bundles jquery-1.9.1 Licensed under MIT license.
+
+This product bundles mocha. All rights reserved. Licensed under MIT.
+Copyright (c) 2011-2014 TJ Holowaychuk <tj@vision-media.ca>
+
+This product bundles NSubstitute v1.6.0.0. Licensed under the BSD 2-Clause License.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e433064b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 45ddf8f..9b0902f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,36 +1,9 @@
 Apache Usergrid_
 Copyright 2014 The Apache Software Foundation.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product bundles SBJson, which is available under a "3-clause BSD" license.
-For details, see sdks/ios/UGAPI/SBJson/ .
-
-This product bundles SSKeychain, which is available under a "MIT/X11" license.
-For details, see sdks/ios/UGAPI/SSKeychain/.
-
-This product bundles angular-senario.js, part of jQuery JavaScript Library v1.10.2
-which Includes Sizzle.js Copyright 2005, 2013 jQuery Foundation, Inc. and
-other contributors. Released under the MIT license.
-
-This product bundles angular.js, specifically AngularJS v1.2.5 (c) 2010-2014
-Google, Inc. Released under the MIT license.
-
-This product bundles Bootstrap v2.3.2 Copyright 2012 Twitter, Inc
-Licensed under the Apache License v2.0
-
-This product bundles jquery-ui-1.8.9. Licensed under MIT license.
-
-This product bundles jquery-1.9.1 Licensed under MIT license.
-
-This product bundles mocha. All rights reserved. Licensed under MIT.
-Copyright (c) 2011-2014 TJ Holowaychuk <tj@vision-media.ca>
-
-This product bundles NSubstitute v1.6.0.0. Licensed under the BSD 2-Clause License.
-
 This product bundles NUnit v2.6.2.
-Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 James W. Newkirk,
Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
+Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 
+James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A.
Craig
 
 This product bundles a number of files within the /sdks/ios
 package.
@@ -64,4 +37,4 @@ package.
 
 This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
 These files can be located within the /sdks/ios package.
- 
+ 
\ No newline at end of file


Mime
View raw message