From d92783ebc6c228ccac99c2558f8c4651bfc851b4 Mon Sep 17 00:00:00 2001 From: Tommy Markley Date: Wed, 12 Jan 2022 17:59:59 -0600 Subject: [PATCH] Revert "Fixes incorrect license headers (#1131)" This reverts commit 86d13f85e54a1f323cf7bde0b7f9c5c763be0d72. --- .eslintrc.js | 12 +++++++ src/plugins/embeddable/.storybook/main.js | 32 ++----------------- .../public/code_editor/.storybook/main.js | 32 ++----------------- 3 files changed, 18 insertions(+), 58 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 70acecc5401..63ea0214700 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -81,6 +81,14 @@ 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. @@ -163,6 +171,7 @@ module.exports = { 'error', { licenses: [ + ELASTIC_LICENSE_HEADER, SAFER_LODASH_SET_HEADER, SAFER_LODASH_SET_LODASH_HEADER, SAFER_LODASH_SET_DEFINITELYTYPED_HEADER, @@ -198,6 +207,7 @@ module.exports = { 'error', { licenses: [ + ELASTIC_LICENSE_HEADER, APACHE_2_0_LICENSE_HEADER, SAFER_LODASH_SET_HEADER, SAFER_LODASH_SET_DEFINITELYTYPED_HEADER, @@ -220,6 +230,7 @@ module.exports = { { licenses: [ OSS_HEADER, + ELASTIC_LICENSE_HEADER, APACHE_2_0_LICENSE_HEADER, SAFER_LODASH_SET_LODASH_HEADER, SAFER_LODASH_SET_DEFINITELYTYPED_HEADER, @@ -243,6 +254,7 @@ 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 a52f70cb02c..f56be0e4fcf 100644 --- a/src/plugins/embeddable/.storybook/main.js +++ b/src/plugins/embeddable/.storybook/main.js @@ -1,33 +1,7 @@ /* - * 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. + * 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. */ 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 a52f70cb02c..f56be0e4fcf 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,33 +1,7 @@ /* - * 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. + * 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. */ module.exports = require('@osd/storybook').defaultConfig;