Build: Replace provided configuration with compileOnly (elastic/x-pack-elasticsearch#3868)
This is the xpack side of elastic/elasticsearch#28564 Original commit: elastic/x-pack-elasticsearch@60033824a4
This commit is contained in:
parent
3c6f9d4d29
commit
4e578fe7cc
|
@ -23,7 +23,7 @@ dependencyLicenses {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
compileOnly "org.elasticsearch:elasticsearch:${version}"
|
||||||
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
||||||
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
||||||
compile "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
|
compile "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}"
|
||||||
|
|
|
@ -10,7 +10,7 @@ esplugin {
|
||||||
archivesBaseName = 'x-pack-deprecation'
|
archivesBaseName = 'x-pack-deprecation'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
run {
|
run {
|
||||||
|
|
|
@ -10,7 +10,7 @@ esplugin {
|
||||||
archivesBaseName = 'x-pack-graph'
|
archivesBaseName = 'x-pack-graph'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ esplugin {
|
||||||
archivesBaseName = 'x-pack-logstash'
|
archivesBaseName = 'x-pack-logstash'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,
|
||||||
compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
|
compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
// This should not be here
|
// This should not be here
|
||||||
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
|
||||||
|
|
|
@ -13,7 +13,7 @@ esplugin {
|
||||||
archivesBaseName = 'x-pack-monitoring'
|
archivesBaseName = 'x-pack-monitoring'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
|
|
||||||
// monitoring deps
|
// monitoring deps
|
||||||
|
|
|
@ -12,9 +12,9 @@ esplugin {
|
||||||
archivesBaseName = 'x-pack-security'
|
archivesBaseName = 'x-pack-security'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
|
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
|
||||||
provided project(path: ':plugins:transport-nio', configuration: 'runtime')
|
compileOnly project(path: ':plugins:transport-nio', configuration: 'runtime')
|
||||||
|
|
||||||
testCompile project(path: xpackModule('monitoring'))
|
testCompile project(path: xpackModule('monitoring'))
|
||||||
testCompile project(path: xpackModule('sql:sql-proto'))
|
testCompile project(path: xpackModule('sql:sql-proto'))
|
||||||
|
|
|
@ -20,9 +20,8 @@ archivesBaseName = 'x-pack-sql'
|
||||||
integTest.enabled = false
|
integTest.enabled = false
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
compile project(xpackModule('sql:sql-proto'))
|
compile project('sql-proto')
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
|
||||||
compile 'org.antlr:antlr4-runtime:4.5.3'
|
compile 'org.antlr:antlr4-runtime:4.5.3'
|
||||||
testCompile "org.elasticsearch.test:framework:${version}"
|
testCompile "org.elasticsearch.test:framework:${version}"
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
|
|
|
@ -14,7 +14,7 @@ esplugin {
|
||||||
archivesBaseName = 'x-pack-upgrade'
|
archivesBaseName = 'x-pack-upgrade'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,11 +23,11 @@ dependencyLicenses {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "org.elasticsearch:elasticsearch:${version}"
|
compileOnly "org.elasticsearch:elasticsearch:${version}"
|
||||||
|
|
||||||
provided "org.elasticsearch.plugin:x-pack-core:${version}"
|
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||||
provided project(path: ':modules:transport-netty4', configuration: 'runtime')
|
compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime')
|
||||||
provided project(path: ':plugins:transport-nio', configuration: 'runtime')
|
compileOnly project(path: ':plugins:transport-nio', configuration: 'runtime')
|
||||||
|
|
||||||
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
|
||||||
|
|
||||||
|
@ -38,8 +38,8 @@ dependencies {
|
||||||
// HACK: java 9 removed javax.activation from the default modules, so instead of trying to add modules, which would have
|
// HACK: java 9 removed javax.activation from the default modules, so instead of trying to add modules, which would have
|
||||||
// to be conditionalized for java 8/9, we pull in the classes directly
|
// to be conditionalized for java 8/9, we pull in the classes directly
|
||||||
compile 'javax.activation:activation:1.1.1'
|
compile 'javax.activation:activation:1.1.1'
|
||||||
provided "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
compileOnly "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
||||||
provided "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
compileOnly "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
||||||
|
|
||||||
testCompile 'org.subethamail:subethasmtp:3.1.7'
|
testCompile 'org.subethamail:subethasmtp:3.1.7'
|
||||||
// needed for subethasmtp, has @GuardedBy annotation
|
// needed for subethasmtp, has @GuardedBy annotation
|
||||||
|
|
|
@ -8,7 +8,7 @@ esplugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided project(path: xpackModule('core'), configuration: 'runtime')
|
compileOnly project(path: xpackModule('core'), configuration: 'runtime')
|
||||||
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
|
testCompile project(path: xpackProject('transport-client').path, configuration: 'runtime')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue