Merge branch 'branch-0.6' into branch-0.6-ci-timeout

yuqi1129 · Aug 27, 2024 · f9b1679 · f9b1679
2 parents 8dc0e08 + 57fdb95
commit f9b1679
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/NOTICE b/NOTICE
@@ -4,8 +4,8 @@ Copyright 2024 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes software developed at
-Datastrato (https://datastrato.ai).
+The initial code for the Gravitino project was donated
+to the ASF by Datastrato (https://datastrato.ai/) copyright 2023-2024.
 
 The Web UI also has a NOTICE file please see web/NOTICE
 for it's contents.

diff --git a/NOTICE.bin b/NOTICE.bin
@@ -4,8 +4,8 @@ Copyright 2024 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes software developed at
-Datastrato (https://datastrato.ai).
+The initial code for the Gravitino project was donated
+to the ASF by Datastrato (https://datastrato.ai/) copyright 2023-2024.
 
 The Web UI also has a NOTICE file please see web/NOTICE
 for it's contents.
@@ -231,8 +231,8 @@ framework implementation, which can be obtained at:
     * license/LICENSE.felix.txt (Apache License 2.0)
   * HOMEPAGE:
     * http://felix.apache.org/
-    
-This product optionally depends on 'Webbit', a Java event based  
+
+This product optionally depends on 'Webbit', a Java event based
 WebSocket and HTTP server:
 
   * LICENSE:
@@ -259,13 +259,13 @@ This product includes software from the Eigenbase project, licensed from
 DynamoBI Corporation.
 
 Copyright (C) 2005 Dynamo BI Corporation
-   
+
   The ExoLab Project (http://www.exolab.org/)
 
   Sun Microsystems (http://www.sun.com/)
-   
+
   Codehaus (http://castor.codehaus.org)
-   
+
   Tatu Saloranta (http://wiki.fasterxml.com/TatuSaloranta)
 
 Apache Ant
@@ -309,14 +309,14 @@ and are placed here unaltered.
 
 (C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
 
-(C) Copyright IBM Corp. 2003. 
+(C) Copyright IBM Corp. 2003.
 
 
 =========================================================================
 
 
-The portion of the functionTests under 'nist' was originally 
-developed by the National Institute of Standards and Technology (NIST), 
+The portion of the functionTests under 'nist' was originally
+developed by the National Institute of Standards and Technology (NIST),
 an agency of the United States Department of Commerce, and adapted by
 International Business Machines Corporation in accordance with the NIST
 Software Acknowledgment and Redistribution document at
@@ -816,8 +816,8 @@ The Apache Software Foundation (http://www.apache.org/).
 
 ## Base64 implementation
 
-JJWT's `io.jsonwebtoken.io.Base64` implementation is based on [MigBase64](https://github.com/brsanthu/migbase64) with 
-continued modifications for Base64 URL support and additional test cases. The MigBase64 copyright and license notice 
+JJWT's `io.jsonwebtoken.io.Base64` implementation is based on [MigBase64](https://github.com/brsanthu/migbase64) with
+continued modifications for Base64 URL support and additional test cases. The MigBase64 copyright and license notice
 have been retained and are repeated here per that code's requirements:
 
 ```
@@ -920,4 +920,4 @@ Third-Party Notices and Licenses:
 
 - Hadoop: Apache Hadoop is used as a dependency
   License: Apache License 2.0
-  Source/Reference: https://github.com/apache/hadoop/blob/trunk/NOTICE.txt
+  Source/Reference: https://github.com/apache/hadoop/blob/trunk/NOTICE.txt
diff --git a/web/NOTICE b/web/NOTICE
@@ -4,8 +4,8 @@ Copyright 2024 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes software developed at
-Datastrato (https://datastrato.ai).
+The initial code for the Gravitino project was donated
+to the ASF by Datastrato (https://datastrato.ai/) copyright 2023-2024.
 
 Apache Zeppelin
 Copyright 2016-2023 The Apache Software Foundation
diff --git a/web/NOTICE.bin b/web/NOTICE.bin
@@ -4,8 +4,8 @@ Copyright 2024 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes software developed at
-Datastrato (https://datastrato.ai).
+The initial code for the Gravitino project was donated
+to the ASF by Datastrato (https://datastrato.ai/) copyright 2023-2024.
 
 Apache Zeppelin
 Copyright 2016-2023 The Apache Software Foundation