Update NOTICE.TXT with OpenSearch copyright (#232)

This commit updates the NOTICE.txt file to include the OpenSearch copyright notice. Signed-off-by: Nicholas Knize <nknize@amazon.com> Signed-off-by: Peter Nied <petern@amazon.com>
opensearch-project · Mar 13, 2021 · 807d0e3 · 807d0e3
1 parent fb1fa31
commit 807d0e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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/...y/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy b/...y/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/...c/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java b/...c/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java
@@ -90,7 +90,7 @@ private TaskProvider<Task> registerCheckNoticeTask(Project project, TaskProvider
             task.doLast(new Action<Task>() {
                 @Override
                 public void execute(Task task) {
-                    final List<String> noticeLines = Arrays.asList("Elasticsearch", "Copyright 2009-2018 Elasticsearch");
+                    final List<String> 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
@@ -485,7 +485,7 @@ subprojects {
         (project.name.contains('deb') && dpkgExists.call(it)) || (project.name.contains('rpm') && rpmExists.call(it))
       }
       doLast {
-        final List<String> noticeLines = Arrays.asList("Elasticsearch", "Copyright 2009-2018 Elasticsearch")
+        final List<String> noticeLines = Arrays.asList("OpenSearch", "Copyright 2021 OpenSearch Contributors")
         final Path noticePath = packageExtractionDir.toPath().resolve("usr/share/elasticsearch/NOTICE.txt")
         assertLinesInFile(noticePath, noticeLines)
       }