From 8adbe2d2884820eddb56c6f5fa69f0f9715bf68c Mon Sep 17 00:00:00 2001 From: Tommy Markley <5437176+tmarkley@users.noreply.github.com> Date: Mon, 23 Jan 2023 21:09:05 -0600 Subject: [PATCH 1/3] Corrects NOTICE file copyright date range * Follow-up on #3051 Resolves #765 Signed-off-by: Tommy Markley <5437176+tmarkley@users.noreply.github.com> --- CHANGELOG.md | 1 + NOTICE.txt | 2 +- src/dev/notice/generate_notice_from_source.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45509e565491..48878ff41c92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [Doc] Add readme for global query persistence ([#3001](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3001)) - Updates NOTICE file, adds validation to GitHub CI ([#3051](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3051)) - [Doc] Add current plugin persistence implementation readme ([#3081](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3081)) +- Corrects NOTICE file copyright date range ([#3308](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3308)) ### 🛠 Maintenance diff --git a/NOTICE.txt b/NOTICE.txt index 5962cc847b61..34da5d0a6f44 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3,7 +3,7 @@ Copyright OpenSearch Contributors This product includes software, including Kibana source code, developed by Elasticsearch (http://www.elastic.co). -Copyright 2009-2018 Elasticsearch B.V. +Copyright 2009-2021 Elasticsearch B.V. This product includes software developed by The Apache Software Foundation (http://www.apache.org/) diff --git a/src/dev/notice/generate_notice_from_source.ts b/src/dev/notice/generate_notice_from_source.ts index 458d123c934e..0bfc2a978e0f 100644 --- a/src/dev/notice/generate_notice_from_source.ts +++ b/src/dev/notice/generate_notice_from_source.ts @@ -37,7 +37,7 @@ const NOTICE_TEXT = `Copyright OpenSearch Contributors This product includes software, including Kibana source code, developed by Elasticsearch (http://www.elastic.co). -Copyright 2009-2018 Elasticsearch B.V. +Copyright 2009-2021 Elasticsearch B.V. This product includes software developed by The Apache Software Foundation (http://www.apache.org/) From 4bbcab4a428b848f7c91b8d44e8bf82b52c82836 Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Fri, 10 Feb 2023 15:58:34 -0800 Subject: [PATCH 2/3] Update CHANGELOG.md Co-authored-by: Miki --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48878ff41c92..d1cb43f33799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,7 +116,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [Doc] Add readme for global query persistence ([#3001](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3001)) - Updates NOTICE file, adds validation to GitHub CI ([#3051](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3051)) - [Doc] Add current plugin persistence implementation readme ([#3081](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3081)) -- Corrects NOTICE file copyright date range ([#3308](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3308)) +- Correct NOTICE file's copyright date range ([#3308](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3308)) ### 🛠 Maintenance From 4082653af2abb1975da7c2722f55ea8d5d0f9b72 Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Fri, 10 Feb 2023 16:12:29 -0800 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1cb43f33799..a014e64f0643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,7 +116,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - [Doc] Add readme for global query persistence ([#3001](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3001)) - Updates NOTICE file, adds validation to GitHub CI ([#3051](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3051)) - [Doc] Add current plugin persistence implementation readme ([#3081](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3081)) -- Correct NOTICE file's copyright date range ([#3308](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3308)) +- Correct copyright date range of NOTICE file and notice generator ([#3308](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3308)) ### 🛠 Maintenance