Skip to content

Commit

Permalink
Update LICENSE and NOTICE (#413)
Browse files Browse the repository at this point in the history 
* Revert "Add Thrift and Hive to NOTICE (#410)"

This reverts commit e9e265a.

* Update year
  • Loading branch information
@Fokko
Fokko authored Feb 13, 2024
1 parent 3a15895 commit fbdf04b
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 29 deletions.
33 changes: 33 additions & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,36 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

--------------------------------------------------------------------------------

This product includes code from Apache Avro.

* Code for initializing the Avro (de)compression codecs
* The Binary decoder for reading in an Avro byte stream

Copyright: 2014-2022 The Apache Software Foundation.
Home page: https://avro.apache.org/
License: https://www.apache.org/licenses/LICENSE-2.0

--------------------------------------------------------------------------------

This product includes code from Apache Thrift.

* Uses the fb303.thrift file that's part of Hive's thrift service in vendor/fb303/

Copyright: 2006-2022 The Apache Software Foundation.
Home page: https://thrift.apache.org/
License: https://www.apache.org/licenses/LICENSE-2.0

--------------------------------------------------------------------------------

This product includes code from Apache Hive.

* Uses hive_metastore.thrift to generate the Hive Metastore client in vendor/hive_metastore/

Copyright: 2008-2022 The Apache Software Foundation.
Home page: https://hive.apache.org/
License: https://www.apache.org/licenses/LICENSE-2.0

--------------------------------------------------------------------------------
29 changes: 0 additions & 29 deletions NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,3 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

--------------------------------------------------------------------------------

This product includes code from Apache Avro.

* Code for initializing the Avro (de)compression codecs
* The Binary decoder for reading in an Avro byte stream

Copyright: 2014-2022 The Apache Software Foundation.
Home page: https://avro.apache.org/
License: https://www.apache.org/licenses/LICENSE-2.0

--------------------------------------------------------------------------------

This product includes code from Apache Thrift.

* Uses the fb303.thrift file that's part of Hive's thrift service in vendor/fb303/

Copyright: 2006-2022 The Apache Software Foundation.
Home page: https://thrift.apache.org/
License: https://www.apache.org/licenses/LICENSE-2.0

--------------------------------------------------------------------------------

This product includes code from Apache Hive.

* Uses hive_metastore.thrift to generate the Hive Metastore client in vendor/hive_metastore/

Copyright: 2008-2022 The Apache Software Foundation.
Home page: https://hive.apache.org/
License: https://www.apache.org/licenses/LICENSE-2.0

1 comment on commit fbdf04b

@royfielding
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This text doesn't belong in either file. Sorry for the bad advice going around.

LICENSE is for the license text, with occasional pointers to different licenses for dependencies.
NOTICE is for your own project's notice and any legal notices required by third parties. ASF projects are not third parties.

This other stuff is might be appropriate for a history section in the README or project documentation.

What you would need to do for NOTICE is see if there is a third-party notice in Hive that specifically refers to the fb303.thrift file. If so, include that third party notice in your NOTICE. If not, don't worry about it.

Please sign in to comment.