Switch to smaller license header

Background on this change opensearch-project/alerting#136 (comment) Signed-off-by: Peter Nied <petern@amazon.com>
peternied · Sep 30, 2022 · 3981380 · 3981380
1 parent 7a687fd
commit 3981380
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 119 deletions.
diff --git a/server/src/main/java/org/opensearch/identity/AccessToken.java b/server/src/main/java/org/opensearch/identity/AccessToken.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/AccessTokenManager.java b/server/src/main/java/org/opensearch/identity/AccessTokenManager.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/AuthenticationManager.java b/server/src/main/java/org/opensearch/identity/AuthenticationManager.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/AuthenticationToken.java b/server/src/main/java/org/opensearch/identity/AuthenticationToken.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/ExtensionTokenProcessor.java b/server/src/main/java/org/opensearch/identity/ExtensionTokenProcessor.java
@@ -1,12 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/Identity.java b/server/src/main/java/org/opensearch/identity/Identity.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/PrincipalIdentifierToken.java b/server/src/main/java/org/opensearch/identity/PrincipalIdentifierToken.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/Principals.java b/server/src/main/java/org/opensearch/identity/Principals.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/StringPrincipal.java b/server/src/main/java/org/opensearch/identity/StringPrincipal.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/Subject.java b/server/src/main/java/org/opensearch/identity/Subject.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/main/java/org/opensearch/identity/authz/AuthorizationRequest.java b/server/src/main/java/org/opensearch/identity/authz/AuthorizationRequest.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/main/java/org/opensearch/identity/authz/AuthorizationResponse.java b/server/src/main/java/org/opensearch/identity/authz/AuthorizationResponse.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/main/java/org/opensearch/identity/authz/AuthorizationStatus.java b/server/src/main/java/org/opensearch/identity/authz/AuthorizationStatus.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/main/java/org/opensearch/identity/authz/CheckableParameter.java b/server/src/main/java/org/opensearch/identity/authz/CheckableParameter.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/main/java/org/opensearch/identity/authz/WriteableParameter.java b/server/src/main/java/org/opensearch/identity/authz/WriteableParameter.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/main/java/org/opensearch/identity/authz/package-info.java b/server/src/main/java/org/opensearch/identity/authz/package-info.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 /**

diff --git a/server/src/main/java/org/opensearch/identity/noop/NoopAccessTokenManager.java b/server/src/main/java/org/opensearch/identity/noop/NoopAccessTokenManager.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 package org.opensearch.identity.noop;
 

diff --git a/server/src/main/java/org/opensearch/identity/noop/NoopAuthenticationManager.java b/server/src/main/java/org/opensearch/identity/noop/NoopAuthenticationManager.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.noop;

diff --git a/server/src/main/java/org/opensearch/identity/noop/NoopSubject.java b/server/src/main/java/org/opensearch/identity/noop/NoopSubject.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.noop;

diff --git a/server/src/main/java/org/opensearch/identity/noop/package-info.java b/server/src/main/java/org/opensearch/identity/noop/package-info.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 /** Classes for the noop authentication in OpenSearch */

diff --git a/server/src/main/java/org/opensearch/identity/package-info.java b/server/src/main/java/org/opensearch/identity/package-info.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 /**

diff --git a/server/src/test/java/org/opensearch/identity/ExtensionTokenProcessorTests.java b/server/src/test/java/org/opensearch/identity/ExtensionTokenProcessorTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/test/java/org/opensearch/identity/IdentityTests.java b/server/src/test/java/org/opensearch/identity/IdentityTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/test/java/org/opensearch/identity/PrincipalIdentifierTokenTests.java b/server/src/test/java/org/opensearch/identity/PrincipalIdentifierTokenTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/test/java/org/opensearch/identity/StringPrincipalTests.java b/server/src/test/java/org/opensearch/identity/StringPrincipalTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity;

diff --git a/server/src/test/java/org/opensearch/identity/authz/CheckableParameterTests.java b/server/src/test/java/org/opensearch/identity/authz/CheckableParameterTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/test/java/org/opensearch/identity/authz/WriteableParameterTests.java b/server/src/test/java/org/opensearch/identity/authz/WriteableParameterTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.authz;

diff --git a/server/src/test/java/org/opensearch/identity/noop/NoopAuthenticationManagerTests.java b/server/src/test/java/org/opensearch/identity/noop/NoopAuthenticationManagerTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.noop;

diff --git a/server/src/test/java/org/opensearch/identity/noop/NoopSubjectTests.java b/server/src/test/java/org/opensearch/identity/noop/NoopSubjectTests.java
@@ -1,9 +1,6 @@
 /*
+ * 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.
  */
 
 package org.opensearch.identity.noop;