Remove MavenFilteringHack (#73637) (#75550)

Co-authored-by: Jake Landis <jake.landis@elastic.co>
This commit is contained in:
Joe Gallo 2021-07-21 09:25:36 -04:00 committed by GitHub
parent d02a481f1f
commit ce98a62427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 160 additions and 177 deletions

View file

@ -6,8 +6,7 @@
* Side Public License, v 1.
*/
import org.elasticsearch.gradle.internal.MavenFilteringHack
import org.apache.tools.ant.filters.ReplaceTokens
import org.elasticsearch.gradle.internal.info.BuildParams
apply plugin: 'elasticsearch.internal-testclusters'
@ -38,5 +37,5 @@ ext.expansions = [
tasks.named("processTestResources").configure {
assert pluginPaths.size() > 0
inputs.properties(expansions)
MavenFilteringHack.filter(it, expansions)
filter("tokens" : expansions.collectEntries {k, v -> [k, v.toString()]} /* must be a map of strings */, ReplaceTokens.class)
}

View file

@ -10,4 +10,4 @@
- do:
nodes.info: {}
- length: { nodes.$master.plugins: ${expected.plugins.count} }
- length: { nodes.$master.plugins: @expected.plugins.count@ }