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>
This commit is contained in:
parent
fb1fa31b65
commit
807d0e3ba0
|
@ -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
|
||||
|
|
|
@ -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")) {
|
||||
|
|
|
@ -90,7 +90,7 @@ public class InternalDistributionArchiveCheckPlugin implements Plugin<Project> {
|
|||
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()
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue