diff --git a/NOTICE.txt b/NOTICE.txt index 9dd784d5a09..be83767d4d9 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 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 32b13ab9068..84939184240 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 623f3ce541b..35b6bb5e385 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 @@ public class InternalDistributionArchiveCheckPlugin implements Plugin { 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 2021 OpenSearch Contributors"); final Path noticePath = checkExtraction.get() .getDestinationDir() .toPath() diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index b97e6ffc5f2..1c7cb12c70f 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) }