From 38f955ef7ea4764c19fca185725a8f84f414abba Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Fri, 21 Dec 2012 22:42:34 +0100 Subject: [PATCH] THRIFT-1746 provide a SPDX file cleanup license: THRIFT-1746_remove_obsolete_old_thrift_license.patch --- LICENSE | 63 -------------------------------------- doc/old-thrift-license.txt | 24 --------------- 2 files changed, 87 deletions(-) delete mode 100644 doc/old-thrift-license.txt diff --git a/LICENSE b/LICENSE index 697fc95d..8db837b7 100644 --- a/LICENSE +++ b/LICENSE @@ -216,69 +216,6 @@ Portions of the following files are licensed under the MIT License: Please see doc/otp-base-license.txt for the full terms of this license. - --------------------------------------------------- -The following files contain some portions of code contributed under -the Thrift Software License (see doc/old-thrift-license.txt), and relicensed -under the Apache 2.0 License: - - compiler/cpp/Makefile.am - compiler/cpp/src/thrift/generate/t_cocoa_generator.cc - compiler/cpp/src/thrift/generate/t_cpp_generator.cc - compiler/cpp/src/thrift/generate/t_csharp_generator.cc - compiler/cpp/src/thrift/generate/t_erl_generator.cc - compiler/cpp/src/thrift/generate/t_hs_generator.cc - compiler/cpp/src/thrift/generate/t_java_generator.cc - compiler/cpp/src/thrift/generate/t_ocaml_generator.cc - compiler/cpp/src/thrift/generate/t_perl_generator.cc - compiler/cpp/src/thrift/generate/t_php_generator.cc - compiler/cpp/src/thrift/generate/t_py_generator.cc - compiler/cpp/src/thrift/generate/t_rb_generator.cc - compiler/cpp/src/thrift/generate/t_st_generator.cc - compiler/cpp/src/thrift/generate/t_xsd_generator.cc - compiler/cpp/src/thrift/main.cc - compiler/cpp/src/thrift/parse/t_field.h - compiler/cpp/src/thrift/parse/t_program.h - compiler/cpp/src/thrift/platform.h - compiler/cpp/src/thrift/thriftl.ll - compiler/cpp/src/thrift/thrifty.yy - lib/csharp/src/Protocol/TBinaryProtocol.cs - lib/csharp/src/Protocol/TField.cs - lib/csharp/src/Protocol/TList.cs - lib/csharp/src/Protocol/TMap.cs - lib/csharp/src/Protocol/TMessage.cs - lib/csharp/src/Protocol/TMessageType.cs - lib/csharp/src/Protocol/TProtocol.cs - lib/csharp/src/Protocol/TProtocolException.cs - lib/csharp/src/Protocol/TProtocolFactory.cs - lib/csharp/src/Protocol/TProtocolUtil.cs - lib/csharp/src/Protocol/TSet.cs - lib/csharp/src/Protocol/TStruct.cs - lib/csharp/src/Protocol/TType.cs - lib/csharp/src/Server/TServer.cs - lib/csharp/src/Server/TSimpleServer.cs - lib/csharp/src/Server/TThreadPoolServer.cs - lib/csharp/src/TApplicationException.cs - lib/csharp/src/Thrift.csproj - lib/csharp/src/Thrift.sln - lib/csharp/src/TProcessor.cs - lib/csharp/src/Transport/TServerSocket.cs - lib/csharp/src/Transport/TServerTransport.cs - lib/csharp/src/Transport/TSocket.cs - lib/csharp/src/Transport/TStreamTransport.cs - lib/csharp/src/Transport/TTransport.cs - lib/csharp/src/Transport/TTransportException.cs - lib/csharp/src/Transport/TTransportFactory.cs - lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs - lib/csharp/ThriftMSBuildTask/ThriftBuild.cs - lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj - lib/rb/lib/thrift.rb - lib/st/README - lib/st/thrift.st - test/OptionalRequiredTest.cpp - test/OptionalRequiredTest.thrift - test/ThriftTest.thrift - -------------------------------------------------- For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 components: diff --git a/doc/old-thrift-license.txt b/doc/old-thrift-license.txt deleted file mode 100644 index 0101a7dc..00000000 --- a/doc/old-thrift-license.txt +++ /dev/null @@ -1,24 +0,0 @@ -Thrift Software License -Copyright (c) 2006- Facebook, Inc. - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -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, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -- 2.17.1