HLREST: Bundle the x-pack protocol project (#31904)
The `:x-pack:protocol` project is an implementation detail shared by the xpack projects and the high level rest client and really doesn't deserve its own maven coordinants and published javadoc. This change bundles `:x-pack:protocol` into the high level rest client. Relates to #29827
This commit is contained in:
parent
25cd835010
commit
4d83a0dd5a
|
@ -1,5 +1,3 @@
|
|||
import org.elasticsearch.gradle.precommit.PrecommitTasks
|
||||
|
||||
/*
|
||||
* Licensed to Elasticsearch under one or more contributor
|
||||
* license agreements. See the NOTICE file distributed with
|
||||
|
@ -18,30 +16,86 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
|
|||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
import org.elasticsearch.gradle.precommit.PrecommitTasks
|
||||
import org.gradle.api.XmlProvider
|
||||
import org.gradle.api.publish.maven.MavenPublication
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
maven {
|
||||
url 'https://plugins.gradle.org/m2/'
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'elasticsearch.build'
|
||||
apply plugin: 'elasticsearch.rest-test'
|
||||
apply plugin: 'nebula.maven-base-publish'
|
||||
apply plugin: 'nebula.maven-scm'
|
||||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
|
||||
group = 'org.elasticsearch.client'
|
||||
archivesBaseName = 'elasticsearch-rest-high-level-client'
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
nebula {
|
||||
artifactId = archivesBaseName
|
||||
publications {
|
||||
nebula(MavenPublication) {
|
||||
artifact shadowJar
|
||||
artifactId = archivesBaseName
|
||||
/*
|
||||
* Configure the pom to include the "shadow" as compile dependencies
|
||||
* because that is how we're using them but remove all other dependencies
|
||||
* because they've been shaded into the jar.
|
||||
*/
|
||||
pom.withXml { XmlProvider xml ->
|
||||
Node root = xml.asNode()
|
||||
root.remove(root.dependencies)
|
||||
Node dependenciesNode = root.appendNode('dependencies')
|
||||
project.configurations.shadow.allDependencies.each {
|
||||
if (false == it instanceof SelfResolvingDependency) {
|
||||
Node dependencyNode = dependenciesNode.appendNode('dependency')
|
||||
dependencyNode.appendNode('groupId', it.group)
|
||||
dependencyNode.appendNode('artifactId', it.name)
|
||||
dependencyNode.appendNode('version', it.version)
|
||||
dependencyNode.appendNode('scope', 'compile')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* We need somewhere to configure dependencies that we don't wish to shade
|
||||
* into the high level REST client. The shadow plugin creates a "shadow"
|
||||
* configuration which is *almost* exactly that. It is never bundled into
|
||||
* the shaded jar but is used for main source compilation. Unfortunately,
|
||||
* by default it is not used for *test* source compilation and isn't used
|
||||
* in tests at all. This change makes it available for test compilation.
|
||||
* A change below makes it available for testing.
|
||||
*/
|
||||
sourceSets {
|
||||
test {
|
||||
compileClasspath += configurations.shadow
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.elasticsearch:elasticsearch:${version}"
|
||||
compile "org.elasticsearch.client:elasticsearch-rest-client:${version}"
|
||||
compile "org.elasticsearch.plugin:parent-join-client:${version}"
|
||||
compile "org.elasticsearch.plugin:aggs-matrix-stats-client:${version}"
|
||||
compile "org.elasticsearch.plugin:rank-eval-client:${version}"
|
||||
compile "org.elasticsearch.plugin:lang-mustache-client:${version}"
|
||||
compile project(':x-pack:protocol') // TODO bundle into the jar
|
||||
/*
|
||||
* Everything in the "shadow" configuration is *not* copied into the
|
||||
* shadowJar.
|
||||
*/
|
||||
shadow "org.elasticsearch:elasticsearch:${version}"
|
||||
shadow "org.elasticsearch.client:elasticsearch-rest-client:${version}"
|
||||
shadow "org.elasticsearch.plugin:parent-join-client:${version}"
|
||||
shadow "org.elasticsearch.plugin:aggs-matrix-stats-client:${version}"
|
||||
shadow "org.elasticsearch.plugin:rank-eval-client:${version}"
|
||||
shadow "org.elasticsearch.plugin:lang-mustache-client:${version}"
|
||||
compile project(':x-pack:protocol')
|
||||
|
||||
testCompile "org.elasticsearch.client:test:${version}"
|
||||
testCompile "org.elasticsearch.test:framework:${version}"
|
||||
|
@ -64,3 +118,48 @@ forbiddenApisMain {
|
|||
signaturesURLs += [PrecommitTasks.getResource('/forbidden/http-signatures.txt')]
|
||||
signaturesURLs += [file('src/main/resources/forbidden/rest-high-level-signatures.txt').toURI().toURL()]
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
classifier = null
|
||||
mergeServiceFiles()
|
||||
}
|
||||
|
||||
// We don't need normal jar, we use shadow jar instead
|
||||
jar.enabled = false
|
||||
assemble.dependsOn shadowJar
|
||||
|
||||
javadoc {
|
||||
/*
|
||||
* Bundle all of the javadoc from all of the shaded projects into this one
|
||||
* so we don't *have* to publish javadoc for all of the "client" jars.
|
||||
*/
|
||||
configurations.compile.dependencies.all { Dependency dep ->
|
||||
Project p = dependencyToProject(dep)
|
||||
if (p != null) {
|
||||
evaluationDependsOn(p.path)
|
||||
source += p.sourceSets.main.allJava
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Use the jar for testing so we have tests of the bundled jar.
|
||||
* Use the "shadow" configuration for testing because we need things
|
||||
* in it.
|
||||
*/
|
||||
test {
|
||||
classpath -= compileJava.outputs.files
|
||||
classpath -= configurations.compile
|
||||
classpath -= configurations.runtime
|
||||
classpath += configurations.shadow
|
||||
classpath += shadowJar.outputs.files
|
||||
dependsOn shadowJar
|
||||
}
|
||||
integTestRunner {
|
||||
classpath -= compileJava.outputs.files
|
||||
classpath -= configurations.compile
|
||||
classpath -= configurations.runtime
|
||||
classpath += configurations.shadow
|
||||
classpath += shadowJar.outputs.files
|
||||
dependsOn shadowJar
|
||||
}
|
||||
|
|
|
@ -21,5 +21,5 @@ apply plugin: 'elasticsearch.rest-test'
|
|||
apply plugin: 'elasticsearch.test-with-dependencies'
|
||||
|
||||
dependencies {
|
||||
testCompile project(path: ':client:rest-high-level', configuration: 'runtime')
|
||||
testCompile project(path: ':client:rest-high-level', configuration: 'shadow')
|
||||
}
|
Loading…
Reference in New Issue