Skip to content

Fix dependencies + pom building #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 2, 2025
Merged

Fix dependencies + pom building #1010

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2ff4d5
fix dependencies + pom building
l-trotta May 2, 2025
b9a315b
add spdx
l-trotta May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 9 additions & 25 deletions java-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,29 +162,6 @@ publishing {
developerConnection.set("scm:git:ssh://git@github.com:elastic/elasticsearch-java.git")
url.set("https://github.com/elastic/elasticsearch-java/")
}

withXml {
// Note: org.elasticsearch.client is now an optional dependency, so the below is no more useful.
// It's kept in case it ever comes back as a required dependency.

// Set the version of dependencies of the org.elasticsearch.client group to the one that we are building.
// Since the unified release process releases everything at once, this ensures all published artifacts depend
// on the exact same version. This assumes of course that the binary API and the behavior of these dependencies
// are the same as the one used in the dependency section below.
val xPathFactory = javax.xml.xpath.XPathFactory.newInstance()
val depSelector = xPathFactory.newXPath()
.compile("/project/dependencies/dependency[groupId/text() = 'org.elasticsearch.client']")
val versionSelector = xPathFactory.newXPath().compile("version")

val deps = depSelector.evaluate(asElement().ownerDocument, javax.xml.xpath.XPathConstants.NODESET)
as org.w3c.dom.NodeList

for (i in 0 until deps.length) {
val dep = deps.item(i)
val version = versionSelector.evaluate(dep, javax.xml.xpath.XPathConstants.NODE) as org.w3c.dom.Element
version.textContent = project.version.toString()
}
}
}
}
}
Expand All @@ -200,7 +177,7 @@ signing {
dependencies {
// Compile and test with the last 8.x version to make sure transition scenarios where
// the Java API client coexists with a 8.x HLRC work fine
val elasticsearchVersion = "8.17.0"
val elasticsearchVersion = "9.0.0"
val jacksonVersion = "2.18.3"
val openTelemetryVersion = "1.29.0"

Expand All @@ -209,7 +186,9 @@ dependencies {
compileOnly("org.elasticsearch.client", "elasticsearch-rest-client", elasticsearchVersion)
testImplementation("org.elasticsearch.client", "elasticsearch-rest-client", elasticsearchVersion)

api("org.apache.httpcomponents.client5","httpclient5","5.4")
// Apache 2.0
// https://hc.apache.org/httpcomponents-client-ga/
api("org.apache.httpcomponents.client5","httpclient5","5.4.4")

// Apache 2.0
// https://search.maven.org/artifact/com.google.code.findbugs/jsr305
Expand All @@ -224,6 +203,10 @@ dependencies {
// https://github.com/eclipse-ee4j/parsson
api("org.eclipse.parsson:parsson:1.1.7")

// Apache 2.0
// http://commons.apache.org/logging/
api("commons-logging:commons-logging:1.3.5")

// OpenTelemetry API for native instrumentation of the client.
// Apache 2.0
// https://github.com/open-telemetry/opentelemetry-java
Expand Down Expand Up @@ -292,6 +275,7 @@ class SpdxReporter(val dest: File) : ReportRenderer {
"The Apache License, Version 2.0" to "Apache-2.0",
"Apache License, Version 2.0" to "Apache-2.0",
"The Apache Software License, Version 2.0" to "Apache-2.0",
"Apache-2.0" to "Apache-2.0",
"MIT License" to "MIT",
"BSD Zero Clause License" to "0BSD",
"Eclipse Public License 2.0" to "EPL-2.0",
Expand Down
Loading