Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change license and remove references to PATENTS #10804

Merged
merged 3 commits into from
Sep 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
42 changes: 16 additions & 26 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,31 +1,21 @@
BSD License

For React software
MIT License

Copyright (c) 2013-present, Facebook, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

* Neither the name Facebook nor the names of its contributors may be used to
endorse or promote products derived from this software without specific
prior written permission.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE 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.
33 changes: 0 additions & 33 deletions PATENTS

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ To help you get your feet wet and get you familiar with our contribution process

### License

React is [BSD licensed](./LICENSE). We also provide an additional [patent grant](./PATENTS).
React is [MIT licensed](./LICENSE).

React documentation is [Creative Commons licensed](./LICENSE-docs).

Expand Down
6 changes: 2 additions & 4 deletions docs/_js/ErrorDecoderComponent.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright (c) 2013-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/* global React ReactDOM errorMap:true */
'use strict';
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/how-to-contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ React team meets once a week to discuss the development of React, future plans,

### License

By contributing to React, you agree that your contributions will be licensed under its BSD license.
By contributing to React, you agree that your contributions will be licensed under its MIT license.

### What Next?

Expand Down
8 changes: 3 additions & 5 deletions eslint-rules/__tests__/no-primitive-constructors-test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) 2015-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @emails react-core
*/
Expand Down
8 changes: 3 additions & 5 deletions eslint-rules/__tests__/warning-and-invariant-args-test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) 2015-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @emails react-core
*/
Expand Down
8 changes: 3 additions & 5 deletions eslint-rules/no-primitive-constructors.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) 2015-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @emails react-core
*/
Expand Down
8 changes: 3 additions & 5 deletions eslint-rules/warning-and-invariant-args.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) 2015-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @emails react-core
*/
Expand Down
8 changes: 3 additions & 5 deletions fixtures/art/VectorWidget.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2013 Facebook, Inc.
* All rights reserved.
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
'use strict';

Expand Down
2 changes: 1 addition & 1 deletion fixtures/dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"classnames": "^2.2.5",
"core-js": "^2.4.1",
"prop-types": "^15.5.6",
"prop-types": "^15.6.0",
"query-string": "^4.2.3",
"react": "^15.4.1",
"react-dom": "^15.4.1",
Expand Down
6 changes: 2 additions & 4 deletions flow/environment.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow
*/
Expand Down
6 changes: 2 additions & 4 deletions flow/react-native-host-hooks.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow
*/
Expand Down
8 changes: 3 additions & 5 deletions mocks/ReactElementTestChild.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2013-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @providesModule ReactElementTestChild
*/
Expand Down
8 changes: 3 additions & 5 deletions mocks/ReactMockedComponentTestComponent.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright 2013-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @providesModule ReactMockedComponentTestComponent
*/
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"coffee-script": "^1.8.0",
"core-js": "^2.2.1",
"coveralls": "^2.11.6",
"create-react-class": "^15.6.0",
"create-react-class": "^15.6.2",
"del": "^2.0.2",
"derequire": "^2.0.3",
"escape-string-regexp": "^1.0.5",
Expand All @@ -51,7 +51,7 @@
"eslint-plugin-flowtype": "^2.25.0",
"eslint-plugin-react": "^6.7.1",
"eslint-plugin-react-internal": "file:./eslint-rules",
"fbjs": "^0.8.9",
"fbjs": "^0.8.16",
"fbjs-scripts": "^0.6.0",
"filesize": "^3.5.6",
"flow-bin": "^0.53.1",
Expand All @@ -71,7 +71,7 @@
"object-assign": "^4.1.1",
"platform": "^1.1.0",
"prettier": "1.2.2",
"prop-types": "^15.5.8",
"prop-types": "^15.6.0",
"rimraf": "^2.6.1",
"rollup": "^0.41.6",
"rollup-plugin-alias": "^1.2.1",
Expand Down
8 changes: 3 additions & 5 deletions packages/react-art/lib/Circle.art.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

/**
* Copyright (c) 2013-present Facebook, Inc.
* All rights reserved.
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @providesModule Circle.art
* @typechecks
Expand Down
8 changes: 3 additions & 5 deletions packages/react-art/lib/Rectangle.art.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

/**
* Copyright (c) 2013-present Facebook, Inc.
* All rights reserved.
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @providesModule Rectangle.art
* @typechecks
Expand Down
8 changes: 3 additions & 5 deletions packages/react-art/lib/Wedge.art.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

/**
* Copyright (c) 2013-present Facebook, Inc.
* All rights reserved.
* Copyright (c) 2013-present, Facebook, Inc.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @providesModule Wedge.art
* @typechecks
Expand Down
9 changes: 4 additions & 5 deletions packages/react-art/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,23 @@
"canvas",
"jsx"
],
"license": "BSD-3-Clause",
"license": "MIT",
"bugs": {
"url": "https://github.com/facebook/react/issues"
},
"homepage": "https://facebook.github.io/react/",
"dependencies": {
"create-react-class": "^15.6.0",
"fbjs": "^0.8.9",
"create-react-class": "^15.6.2",
"fbjs": "^0.8.16",
"loose-envify": "^1.1.0",
"object-assign": "^4.1.0",
"prop-types": "^15.5.6"
"prop-types": "^15.6.0"
},
"peerDependencies": {
"react": "^16.0.0-beta.5"
},
"files": [
"LICENSE",
"PATENTS",
"README.md",
"index.js",
"cjs/",
Expand Down
7 changes: 3 additions & 4 deletions packages/react-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@
"keywords": [
"react"
],
"license": "BSD-3-Clause",
"license": "MIT",
"bugs": {
"url": "https://github.com/facebook/react/issues"
},
"homepage": "https://facebook.github.io/react/",
"dependencies": {
"fbjs": "^0.8.9",
"fbjs": "^0.8.16",
"loose-envify": "^1.1.0",
"object-assign": "^4.1.0",
"prop-types": "^15.5.6"
"prop-types": "^15.6.0"
},
"peerDependencies": {
"react": "^16.0.0-beta.5"
},
"files": [
"LICENSE",
"PATENTS",
"README.md",
"index.js",
"server.js",
Expand Down
5 changes: 2 additions & 3 deletions packages/react-noop-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
"description": "React package for testing the Fiber reconciler.",
"main": "index.js",
"repository": "facebook/react",
"license": "BSD-3-Clause",
"license": "MIT",
"dependencies": {
"fbjs": "^0.8.9",
"fbjs": "^0.8.16",
"object-assign": "^4.1.0"
},
"files": [
"LICENSE",
"PATENTS",
"README.md",
"index.js",
"cjs/"
Expand Down
Loading