Skip to content

Commit 3b40cf7

Browse files
cliu123cliu123
authored
Revert "Updates license headers (#1829)"
This reverts commit f431ec2.
1 parent f431ec2 commit 3b40cf7

File tree

397 files changed

+3933
-2397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

397 files changed

+3933
-2397
lines changed

‎config/checkstyle/sun_checks.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,4 @@
204204
<property name="severity" value="warning"/>
205205
</module>
206206

207-
<!-- Checks for Headers to not contain old license text -->
208-
<module name="RegexpSingleline">
209-
<property name="format" value="\*( Portions)? Copyright OpenSearch Contributors"/>
210-
<property name="ignoreCase" value="true"/>
211-
<property name="message" value="Incorrect license header" />
212-
<property name="severity" value="error"/>
213-
</module>
214-
215207
</module>

‎plugin-security.policy‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616
*/
1717

1818
/*
19-
* SPDX-License-Identifier: Apache-2.0
19+
* Portions Copyright OpenSearch Contributors
2020
*
21-
* The OpenSearch Contributors require contributions made to
22-
* this file be licensed under the Apache-2.0 license or a
23-
* compatible open source license.
21+
* Licensed under the Apache License, Version 2.0 (the "License").
22+
* You may not use this file except in compliance with the License.
23+
* A copy of the License is located at
2424
*
25-
* Modifications Copyright OpenSearch Contributors. See
26-
* GitHub history for details.
25+
* http://www.apache.org/licenses/LICENSE-2.0
26+
*
27+
* or in the "license" file accompanying this file. This file is distributed
28+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
29+
* express or implied. See the License for the specific language governing
30+
* permissions and limitations under the License.
2731
*/
2832

2933

‎src/main/java/com/amazon/dlic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt;

‎src/main/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticator.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt;

‎src/main/java/com/amazon/dlic/auth/http/jwt/keybyoidc/AuthenticatorUnavailableException.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt.keybyoidc;

‎src/main/java/com/amazon/dlic/auth/http/jwt/keybyoidc/BadCredentialsException.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt.keybyoidc;

‎src/main/java/com/amazon/dlic/auth/http/jwt/keybyoidc/HTTPJwtKeyByOpenIdConnectAuthenticator.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt.keybyoidc;

‎src/main/java/com/amazon/dlic/auth/http/jwt/keybyoidc/JwtVerifier.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt.keybyoidc;

‎src/main/java/com/amazon/dlic/auth/http/jwt/keybyoidc/KeyProvider.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt.keybyoidc;

‎src/main/java/com/amazon/dlic/auth/http/jwt/keybyoidc/KeySetProvider.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
/*
2-
* SPDX-License-Identifier: Apache-2.0
2+
* Copyright OpenSearch Contributors
33
*
4-
* The OpenSearch Contributors require contributions made to
5-
* this file be licensed under the Apache-2.0 license or a
6-
* compatible open source license.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
77
*
8-
* Modifications Copyright OpenSearch Contributors. See
9-
* GitHub history for details.
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
1014
*/
1115

1216
package com.amazon.dlic.auth.http.jwt.keybyoidc;

0 commit comments

Comments
 (0)