Remove deprecation warnings to prepare for Gradle 5 (sourceSets.main.output.classesDirs) #30389
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package org.elasticsearch.gradle; | ||
|
|
||
| import groovy.lang.Closure; | ||
| import org.gradle.api.GradleException; | ||
| import org.gradle.api.Task; | ||
| import org.gradle.api.tasks.Exec; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * A wrapper around gradle's Exec task to capture output and log on error. | ||
| */ | ||
| public class LoggedExec extends Exec { | ||
|
|
||
| protected ByteArrayOutputStream output = new ByteArrayOutputStream(); | ||
|
|
||
| public LoggedExec() { | ||
| if (getLogger().isInfoEnabled() == false) { | ||
| setStandardOutput(output); | ||
| setErrorOutput(output); | ||
| setIgnoreExitValue(true); | ||
| doLast(new Closure<Void>(this, this) { | ||
| public void doCall(Task it) throws IOException { | ||
| if (getExecResult().getExitValue() != 0) { | ||
| for (String line : output.toString("UTF-8").split("\\R")) { | ||
| getLogger().error(line); | ||
| } | ||
| throw new GradleException( | ||
| "Process \'" + getExecutable() + " " + | ||
| getArgs().stream().collect(Collectors.joining(" "))+ | ||
| "\' finished with non-zero exit value " + | ||
| String.valueOf(getExecResult().getExitValue()) | ||
| ); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package org.elasticsearch.gradle; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
|
|
||
| /** | ||
| * Accessor for shared dependency versions used by elasticsearch, namely the elasticsearch and lucene versions. | ||
| */ | ||
| public class VersionProperties { | ||
|
There was a problem hiding this comment. It appears this is being moved to a java file, but it is still under There was a problem hiding this comment. Yes. That is because the Groovy compiler knows how to deal with this and delegate these files to the Java compiler. The reason these can't move to |
||
| public static Version getElasticsearch() { | ||
| return elasticsearch; | ||
| } | ||
|
|
||
| public static String getLucene() { | ||
| return lucene; | ||
| } | ||
|
|
||
| public static Map<String, String> getVersions() { | ||
| return versions; | ||
| } | ||
|
|
||
| private static final Version elasticsearch; | ||
| private static final String lucene; | ||
| private static final Map<String, String> versions = new HashMap<String, String>(); | ||
| static { | ||
| Properties props = getVersionProperties(); | ||
| elasticsearch = Version.fromString(props.getProperty("elasticsearch")); | ||
| lucene = props.getProperty("lucene"); | ||
| for (String property : props.stringPropertyNames()) { | ||
| versions.put(property, props.getProperty(property)); | ||
| } | ||
| } | ||
|
|
||
| private static Properties getVersionProperties() { | ||
| Properties props = new Properties(); | ||
| InputStream propsStream = VersionProperties.class.getResourceAsStream("/version.properties"); | ||
| if (propsStream == null) { | ||
| throw new RuntimeException("/version.properties resource missing"); | ||
| } | ||
| try { | ||
| props.load(propsStream); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| return props; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to be moved to a java file, but still exists under
src/main/groovy?