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

Build: Fix notice generation to use configured notice file (#23472) 

While the esplugin extension already had an input for the base notice
file of the plugin, the NoticeTask did not actually know how to use
that, and always used the base notice file from Elasticsearch.
This commit is contained in:
Ryan Ernst 2017-03-02 19:02:43 -08:00 committed by GitHub
parent 946b9794ad
commit 188c2b3a26
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildSrc/src/main/groovy/org/elasticsearch/gradle/NoticeTask.groovy
View File

@ -22,6 +22,7 @@ package org.elasticsearch.gradle
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.Configuration
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskAction
@ -30,8 +31,11 @@ import org.gradle.api.tasks.TaskAction
*/ */
public class NoticeTask extends DefaultTask { public class NoticeTask extends DefaultTask {
@InputFile
File inputFile = project.rootProject.file('NOTICE.txt')
@OutputFile @OutputFile
File noticeFile = new File(project.buildDir, "notices/${name}/NOTICE.txt") File outputFile = new File(project.buildDir, "notices/${name}/NOTICE.txt")
/** Configurations to inspect dependencies*/ /** Configurations to inspect dependencies*/
private List<Project> dependencies = new ArrayList<>() private List<Project> dependencies = new ArrayList<>()
@ -48,7 +52,7 @@ public class NoticeTask extends DefaultTask {
@TaskAction @TaskAction
public void generateNotice() { public void generateNotice() {
StringBuilder output = new StringBuilder() StringBuilder output = new StringBuilder()
output.append(project.rootProject.file('NOTICE.txt').getText('UTF-8')) output.append(inputFile.getText('UTF-8'))
output.append('\n\n') output.append('\n\n')
Set<String> seen = new HashSet<>() Set<String> seen = new HashSet<>()
for (Project dep : dependencies) { for (Project dep : dependencies) {
@ -61,7 +65,7 @@ public class NoticeTask extends DefaultTask {
seen.add(file.name) seen.add(file.name)
} }
} }
noticeFile.setText(output.toString(), 'UTF-8') outputFile.setText(output.toString(), 'UTF-8')
} }
static void appendFile(File file, String name, String type, StringBuilder output) { static void appendFile(File file, String name, String type, StringBuilder output) {

1
buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
View File

@ -261,6 +261,7 @@ public class PluginBuildPlugin extends BuildPlugin {
if (noticeFile != null) { if (noticeFile != null) {
NoticeTask generateNotice = project.tasks.create('generateNotice', NoticeTask.class) NoticeTask generateNotice = project.tasks.create('generateNotice', NoticeTask.class)
generateNotice.dependencies(project) generateNotice.dependencies(project)
generateNotice.inputFile = noticeFile
project.bundlePlugin.from(generateNotice) project.bundlePlugin.from(generateNotice)
} }
} }