honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed copyright to OpenSearch (#1175)

This commit is contained in:
Minal Shah 2021-08-31 09:55:28 -07:00 committed by GitHub
parent 91d9922f3b
commit a43e6cf424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOTICE.txt
View File

@ -1,5 +1,5 @@
OpenSearch (https://opensearch.org/) OpenSearch (https://opensearch.org/)
Copyright 2021 OpenSearch Contributors Copyright OpenSearch Contributors
This product includes software developed by This product includes software developed by
Elasticsearch (http://www.elastic.co). Elasticsearch (http://www.elastic.co).

2
README.md
View File

@ -34,4 +34,4 @@ This project is licensed under the [Apache v2.0 License](LICENSE.txt).
## Copyright ## Copyright
Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. Copyright OpenSearch Contributors. See [NOTICE](NOTICE.txt) for details.

2
buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy
View File

@ -108,7 +108,7 @@ Copyright 2009-2018 Acme Coorp"""
result.task(":darwin-tar:checkNotice").outcome == TaskOutcome.FAILED result.task(":darwin-tar:checkNotice").outcome == TaskOutcome.FAILED
normalizedOutput(result.output).contains("> expected line [2] in " + normalizedOutput(result.output).contains("> expected line [2] in " +
"[./darwin-tar/build/tar-extracted/opensearch-${VersionProperties.getOpenSearch()}/NOTICE.txt] " + "[./darwin-tar/build/tar-extracted/opensearch-${VersionProperties.getOpenSearch()}/NOTICE.txt] " +
"to be [Copyright 2021 OpenSearch Contributors] but was [Copyright 2009-2018 Acme Coorp]") "to be [Copyright OpenSearch Contributors] but was [Copyright 2009-2018 Acme Coorp]")
} }
void license(File file = file("licenses/APACHE-LICENSE-2.0.txt")) { void license(File file = file("licenses/APACHE-LICENSE-2.0.txt")) {

2
buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java
View File

@ -105,7 +105,7 @@ public class InternalDistributionArchiveCheckPlugin implements Plugin<Project> {
public void execute(Task task) { public void execute(Task task) {
final List<String> noticeLines = Arrays.asList( final List<String> noticeLines = Arrays.asList(
"OpenSearch (https://opensearch.org/)", "OpenSearch (https://opensearch.org/)",
"Copyright 2021 OpenSearch Contributors" "Copyright OpenSearch Contributors"
); );
final Path noticePath = checkExtraction.get() final Path noticePath = checkExtraction.get()
.getDestinationDir() .getDestinationDir()

2
distribution/packages/build.gradle
View File

@ -500,7 +500,7 @@ subprojects {
(project.name.contains('deb') && dpkgExists.call(it)) || (project.name.contains('rpm') && rpmExists.call(it)) (project.name.contains('deb') && dpkgExists.call(it)) || (project.name.contains('rpm') && rpmExists.call(it))
} }
doLast { doLast {
final List<String> noticeLines = Arrays.asList("OpenSearch (https://opensearch.org/)", "Copyright 2021 OpenSearch Contributors") final List<String> noticeLines = Arrays.asList("OpenSearch (https://opensearch.org/)", "Copyright OpenSearch Contributors")
final Path noticePath = packageExtractionDir.toPath().resolve("usr/share/opensearch/NOTICE.txt") final Path noticePath = packageExtractionDir.toPath().resolve("usr/share/opensearch/NOTICE.txt")
assertLinesInFile(noticePath, noticeLines) assertLinesInFile(noticePath, noticeLines)
} }