github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-19 04:45:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update year in NOTICE.txt (#109548)

Browse source
This commit is contained in:
Ry Biesemeyer 2024-06-10 15:12:38 -07:00 • committed by GitHub
parent 0be3c741df
commit f75afb0098
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 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 @@
Elasticsearch Elasticsearch
Copyright 2009-2021 Elasticsearch Copyright 2009-2024 Elasticsearch
This product includes software developed by The Apache Software This product includes software developed by The Apache Software
Foundation (http://www.apache.org/). Foundation (http://www.apache.org/).

4
build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy
View file

@ -117,7 +117,7 @@ Copyright 2009-2018 Acme Coorp"""
result.task(":darwin-tar:checkNotice").outcome == TaskOutcome.FAILED result.task(":darwin-tar:checkNotice").outcome == TaskOutcome.FAILED
result.output.contains("> expected line [2] in " + result.output.contains("> expected line [2] in " +
"[./darwin-tar/build/tar-extracted/elasticsearch-${VersionProperties.getElasticsearch()}/NOTICE.txt] " + "[./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"() { def "fails on unexpected ml notice content"() {
@ -125,7 +125,7 @@ Copyright 2009-2018 Acme Coorp"""
elasticLicense() elasticLicense()
elasticLicense(file("LICENSE.txt")) elasticLicense(file("LICENSE.txt"))
file("NOTICE.txt").text = """Elasticsearch 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("ml/NOTICE.txt").text = "Boost Software License - Version 1.0 - August 17th, 2003"
file('darwin-tar/build.gradle') << """ file('darwin-tar/build.gradle') << """

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java
View file

@ -135,7 +135,7 @@ public class InternalDistributionArchiveCheckPlugin implements Plugin<Project> {
task.doLast(new Action<Task>() { task.doLast(new Action<Task>() {
@Override @Override
public void execute(Task task) { 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() final Path noticePath = checkExtraction.get()
.getDestinationDir() .getDestinationDir()
.toPath() .toPath()

2
distribution/packages/build.gradle
View file

@ -495,7 +495,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("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") final Path noticePath = packageExtractionDir.toPath().resolve("usr/share/elasticsearch/NOTICE.txt")
assertLinesInFile(noticePath, noticeLines) assertLinesInFile(noticePath, noticeLines)
} }