Update license from BSD+PATENTS to Straight BSD

Summary:
Reported by the OpenSource automated checkup diagnosis tool (P143448404)

Followed steps here: https://www.internalfb.com/intern/wiki/Open_Source/Maintain_a_FB_OSS_Project/Relicensing_Existing_Project/#from-bsd-patents

Reviewed By: jkedgar

Differential Revision: D23911232

fbshipit-source-id: 006171885ad47c0b057bbb1fdbc9e56acd11e4fc

LICENSE

@@ -2,7 +2,7 @@ BSD License
 
 For Squangle software
 
-Copyright (c) 2014, Facebook, Inc. All rights reserved.
+Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

PATENTS

@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the Squangle software distributed by Facebook, Inc.
-
-Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
-("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook’s rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.

README.md

@@ -26,7 +26,7 @@ License
 -------
 
 SQuangLe is BSD-licensed. We also provide an additional patent grant. Please
-see the LICENSE and PATENTS files.
+see the LICENSE file.
 
 Contributing
 ------------

squangle/base/ConnectionKey.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/base/ConnectionKey.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/base/ExceptionUtil.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #ifndef COMMON_DB_EXCEPTION_UTIL_H

squangle/logger/DBEventCounter.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #include "squangle/logger/DBEventCounter.h"

squangle/logger/DBEventCounter.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #ifndef COMMON_DB_CLIENT_STATS_H

squangle/logger/DBEventLogger.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #include "squangle/logger/DBEventLogger.h"

squangle/logger/DBEventLogger.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2015, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates.
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #ifndef COMMON_DB_EVENT_LOGGER_H

squangle/mysql_client/AsyncConnectionPool.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/AsyncConnectionPool.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //

squangle/mysql_client/AsyncHelpers.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/AsyncHelpers.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #ifndef COMMON_ASYNC_HELPER_H

squangle/mysql_client/AsyncMysqlClient.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/AsyncMysqlClient.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //

squangle/mysql_client/Connection.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/Connection.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #ifndef COMMON_ASYNC_CONNECTION_H

squangle/mysql_client/DbResult.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/DbResult.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #ifndef COMMON_ASYNC_MYSQL_RESULT_H

squangle/mysql_client/FutureAdapter.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/FutureAdapter.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/Operation.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/Operation.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //

squangle/mysql_client/OperationBatch.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //

squangle/mysql_client/OperationBatch.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //

squangle/mysql_client/Query.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/Query.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //

squangle/mysql_client/QueryBenchmark.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 

squangle/mysql_client/Row.cpp

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 #include "squangle/mysql_client/Row.h"

squangle/mysql_client/Row.h

@@ -1,10 +1,9 @@
 /*
- *  Copyright (c) 2016, Facebook, Inc.
+ *  Copyright (c) Facebook, Inc. and its affiliates..
  *  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.
+ *  LICENSE file in the root directory of this source tree.
  *
  */
 //