Update LICENSE and NOTICE (apache#413)

* Revert "Add Thrift and Hive to NOTICE (apache#410)"

This reverts commit e9e265a.

* Update year

LICENSE

@@ -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
+
+--------------------------------------------------------------------------------

NOTICE

@@ -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