* Fix implicit duplicate duplicatesStrategy in processResources * Fix duplicates strategy in docker distribution setup
This commit is contained in:
parent
1ced3f0eb3
commit
e8181fc627
|
@ -58,10 +58,6 @@ dependencies {
|
|||
testImplementation(project(':x-pack:plugin:eql'))
|
||||
}
|
||||
|
||||
processTestResources {
|
||||
from(project(':client:rest-high-level').file('src/test/resources'))
|
||||
}
|
||||
|
||||
tasks.named('forbiddenApisMain').configure {
|
||||
// core does not depend on the httpclient for compile so we add the signatures here. We don't add them for test as they are already
|
||||
// specified
|
||||
|
|
|
@ -94,6 +94,7 @@ project.ext {
|
|||
* Oss and default distribution can have different configuration, therefore we want to allow overriding the default configuration
|
||||
* by creating config files in oss or default build-context sub-modules.
|
||||
*/
|
||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||
from project.projectDir.toPath().resolve("src/docker/config")
|
||||
if (oss) {
|
||||
from project.projectDir.toPath().resolve("src/docker/config/oss")
|
||||
|
|
|
@ -65,6 +65,10 @@ ext.expansions = [
|
|||
|
||||
processResources {
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
// we need to have duplicate strategy here as
|
||||
// we cannot apply the filter on root level due
|
||||
// to wrong behaviour with binary files.
|
||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||
exclude '**/public.key'
|
||||
inputs.properties(expansions)
|
||||
MavenFilteringHack.filter(it, expansions)
|
||||
|
|
Loading…
Reference in New Issue