From de815489d702206301578c1dd2e2c6acb590406b Mon Sep 17 00:00:00 2001 From: Tommy Markley Date: Mon, 10 Jan 2022 23:34:23 +0000 Subject: [PATCH] Fixes incorrect license headers Resolves #1130 Signed-off-by: Tommy Markley --- .eslintrc.js | 12 ------- src/plugins/embeddable/.storybook/main.js | 32 +++++++++++++++++-- .../public/code_editor/.storybook/main.js | 32 +++++++++++++++++-- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 63ea0214700..70acecc5401 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -81,14 +81,6 @@ const APACHE_2_0_LICENSE_HEADER = ` */ `; -const ELASTIC_LICENSE_HEADER = ` -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ -`; - const SAFER_LODASH_SET_HEADER = ` /* * Elasticsearch B.V licenses this file to you under the MIT License. @@ -171,7 +163,6 @@ module.exports = { 'error', { licenses: [ - ELASTIC_LICENSE_HEADER, SAFER_LODASH_SET_HEADER, SAFER_LODASH_SET_LODASH_HEADER, SAFER_LODASH_SET_DEFINITELYTYPED_HEADER, @@ -207,7 +198,6 @@ module.exports = { 'error', { licenses: [ - ELASTIC_LICENSE_HEADER, APACHE_2_0_LICENSE_HEADER, SAFER_LODASH_SET_HEADER, SAFER_LODASH_SET_DEFINITELYTYPED_HEADER, @@ -230,7 +220,6 @@ module.exports = { { licenses: [ OSS_HEADER, - ELASTIC_LICENSE_HEADER, APACHE_2_0_LICENSE_HEADER, SAFER_LODASH_SET_LODASH_HEADER, SAFER_LODASH_SET_DEFINITELYTYPED_HEADER, @@ -254,7 +243,6 @@ module.exports = { { licenses: [ OSS_HEADER, - ELASTIC_LICENSE_HEADER, APACHE_2_0_LICENSE_HEADER, SAFER_LODASH_SET_HEADER, SAFER_LODASH_SET_LODASH_HEADER, diff --git a/src/plugins/embeddable/.storybook/main.js b/src/plugins/embeddable/.storybook/main.js index f56be0e4fcf..a52f70cb02c 100644 --- a/src/plugins/embeddable/.storybook/main.js +++ b/src/plugins/embeddable/.storybook/main.js @@ -1,7 +1,33 @@ /* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. + * 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. + */ + +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, 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. + */ + +/* + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ module.exports = require('@osd/storybook').defaultConfig; diff --git a/src/plugins/opensearch_dashboards_react/public/code_editor/.storybook/main.js b/src/plugins/opensearch_dashboards_react/public/code_editor/.storybook/main.js index f56be0e4fcf..a52f70cb02c 100644 --- a/src/plugins/opensearch_dashboards_react/public/code_editor/.storybook/main.js +++ b/src/plugins/opensearch_dashboards_react/public/code_editor/.storybook/main.js @@ -1,7 +1,33 @@ /* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. + * 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. + */ + +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, 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. + */ + +/* + * Modifications Copyright OpenSearch Contributors. See + * GitHub history for details. */ module.exports = require('@osd/storybook').defaultConfig;