From bbb5426e9624a33dc6b7a90303062cf0066b83e3 Mon Sep 17 00:00:00 2001 From: Nicholas Knize Date: Mon, 8 Mar 2021 11:08:20 -0600 Subject: [PATCH 1/3] Update NOTICE.TXT with OpenSearch copyright This commit updates the NOTICE.txt file to include the OpenSearch copyright notice. Signed-off-by: Nicholas Knize --- NOTICE.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 9dd784d5a09ec..be83767d4d98a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,4 +1,8 @@ -Elasticsearch +OpenSearch +Copyright 2021 OpenSearch Contributors + +This product includes software developed by +Elasticsearch (http://www.elastic.co). Copyright 2009-2018 Elasticsearch This product includes software developed by The Apache Software From a2a8adfa522dbe93ece71d8c06c3633f57858abf Mon Sep 17 00:00:00 2001 From: Nicholas Knize Date: Mon, 8 Mar 2021 12:03:34 -0600 Subject: [PATCH 2/3] Fix notice checks in distribution build Signed-off-by: Nicholas Knize --- .../InternalDistributionArchiveCheckPluginFuncTest.groovy | 2 +- .../gradle/internal/InternalDistributionArchiveCheckPlugin.java | 2 +- distribution/packages/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy index 32b13ab9068fa..8493918424029 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy @@ -98,7 +98,7 @@ Copyright 2009-2018 Acme Coorp""" result.task(":darwin-tar:checkNotice").outcome == TaskOutcome.FAILED normalizedOutput(result.output).contains("> expected line [2] in " + "[./darwin-tar/build/tar-extracted/elasticsearch-${VersionProperties.getElasticsearch()}/NOTICE.txt] " + - "to be [Copyright 2009-2018 Elasticsearch] but was [Copyright 2009-2018 Acme Coorp]") + "to be [Copyright 2021 OpenSearch Contributors] but was [Copyright 2009-2018 Acme Coorp]") } void license(File file = file("licenses/APACHE-LICENSE-2.0.txt")) { diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java index 623f3ce541ba0..2aab51ef7dc95 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java @@ -90,7 +90,7 @@ private TaskProvider registerCheckNoticeTask(Project project, TaskProvider task.doLast(new Action() { @Override public void execute(Task task) { - final List noticeLines = Arrays.asList("Elasticsearch", "Copyright 2009-2018 Elasticsearch"); + final List noticeLines = Arrays.asList("OpenSearch", "Copyright 20021 OpenSearch Contributors"); final Path noticePath = checkExtraction.get() .getDestinationDir() .toPath() diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index b97e6ffc5f215..1c7cb12c70f41 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -485,7 +485,7 @@ subprojects { (project.name.contains('deb') && dpkgExists.call(it)) || (project.name.contains('rpm') && rpmExists.call(it)) } doLast { - final List noticeLines = Arrays.asList("Elasticsearch", "Copyright 2009-2018 Elasticsearch") + final List noticeLines = Arrays.asList("OpenSearch", "Copyright 2021 OpenSearch Contributors") final Path noticePath = packageExtractionDir.toPath().resolve("usr/share/elasticsearch/NOTICE.txt") assertLinesInFile(noticePath, noticeLines) } From 6870b36303fa8f9257849b7b7efab07374dc077e Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Thu, 11 Mar 2021 16:29:16 -0600 Subject: [PATCH 3/3] Update InternalDistributionArchiveCheckPlugin.java Fix year typo --- .../gradle/internal/InternalDistributionArchiveCheckPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java index 2aab51ef7dc95..35b6bb5e385d2 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java @@ -90,7 +90,7 @@ private TaskProvider registerCheckNoticeTask(Project project, TaskProvider task.doLast(new Action() { @Override public void execute(Task task) { - final List noticeLines = Arrays.asList("OpenSearch", "Copyright 20021 OpenSearch Contributors"); + final List noticeLines = Arrays.asList("OpenSearch", "Copyright 2021 OpenSearch Contributors"); final Path noticePath = checkExtraction.get() .getDestinationDir() .toPath()