From d32533a0ebac56c4ece38a0ec89f1264cf5971fc Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Fri, 13 Aug 2021 09:29:36 -0400
Subject: [PATCH] Update OpenSearch LicenseHeaders to use the short version
 (#29)

* Update OpenSearch LicenseHeaders to use the short version
* Adding new header summary text per Henri suggestions

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
---
 CONTRIBUTING.md | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 709b66b8842..6cf6b6fbb4b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,45 +92,27 @@ You may type this line on your own when writing your commit messages. However, i
 
 ## License Headers
 
-New files in your code contributions should contain the following license header. If you are modifying existing files do not remove or modify existing license headers.
+New files in your code contributions should contain the following license header. If you are modifying existing files with license headers, or including new files that already have license headers, do not remove or modify them without guidance.
 
 ### Java
 
 ```
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 ```
 
 ### Python
 ```
+# Copyright OpenSearch Contributors
 # SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-#
-# Modifications Copyright OpenSearch Contributors. See
-# GitHub history for details.
 ```
 
 ### Shell
 ```
+# Copyright OpenSearch Contributors
 # SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-#
-# Modifications Copyright OpenSearch Contributors. See
-# GitHub history for details.
 ```
 
 ## Review Process