Skip to content

Commit

Permalink
Update year in NOTICE.txt (elastic#109548)
Browse files Browse the repository at this point in the history
  • Loading branch information
yaauie authored Jun 10, 2024
1 parent 0be3c74 commit f75afb0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Elasticsearch
Copyright 2009-2021 Elasticsearch
Copyright 2009-2024 Elasticsearch

This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ Copyright 2009-2018 Acme Coorp"""
result.task(":darwin-tar:checkNotice").outcome == TaskOutcome.FAILED
result.output.contains("> expected line [2] in " +
"[./darwin-tar/build/tar-extracted/elasticsearch-${VersionProperties.getElasticsearch()}/NOTICE.txt] " +
"to be [Copyright 2009-2021 Elasticsearch] but was [Copyright 2009-2018 Acme Coorp]")
"to be [Copyright 2009-2024 Elasticsearch] but was [Copyright 2009-2018 Acme Coorp]")
}

def "fails on unexpected ml notice content"() {
given:
elasticLicense()
elasticLicense(file("LICENSE.txt"))
file("NOTICE.txt").text = """Elasticsearch
Copyright 2009-2021 Elasticsearch"""
Copyright 2009-2024 Elasticsearch"""

file("ml/NOTICE.txt").text = "Boost Software License - Version 1.0 - August 17th, 2003"
file('darwin-tar/build.gradle') << """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,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-2021 Elasticsearch");
final List<String> noticeLines = Arrays.asList("Elasticsearch", "Copyright 2009-2024 Elasticsearch");
final Path noticePath = checkExtraction.get()
.getDestinationDir()
.toPath()
Expand Down
2 changes: 1 addition & 1 deletion distribution/packages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,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-2021 Elasticsearch")
final List<String> noticeLines = Arrays.asList("Elasticsearch", "Copyright 2009-2024 Elasticsearch")
final Path noticePath = packageExtractionDir.toPath().resolve("usr/share/elasticsearch/NOTICE.txt")
assertLinesInFile(noticePath, noticeLines)
}
Expand Down

0 comments on commit f75afb0

Please sign in to comment.