From b9f5a529adc4ef9438011770c5a4a5f1797f335e Mon Sep 17 00:00:00 2001 From: David Smiley Date: Tue, 31 Mar 2026 18:11:30 -0400 Subject: [PATCH 1/2] SOLR-18185: POMs: publish resolved version of dependencies. Fixes ambiguous/missing version problems for clients. --- changelog/unreleased/SOLR-18185-pomPublishVersions.yml | 7 +++++++ gradle/maven/defaults-maven.gradle | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 changelog/unreleased/SOLR-18185-pomPublishVersions.yml diff --git a/changelog/unreleased/SOLR-18185-pomPublishVersions.yml b/changelog/unreleased/SOLR-18185-pomPublishVersions.yml new file mode 100644 index 000000000000..3a732a610eb6 --- /dev/null +++ b/changelog/unreleased/SOLR-18185-pomPublishVersions.yml @@ -0,0 +1,7 @@ +title: Published POMs are now published with the resolved version. Fixes ambiguous/missing version problems. +type: fixed +authors: + - name: David Smiley +links: + - name: SOLR-18185 + url: https://issues.apache.org/jira/browse/SOLR-18185 diff --git a/gradle/maven/defaults-maven.gradle b/gradle/maven/defaults-maven.gradle index ea20f908ad15..418a60ea1d8c 100644 --- a/gradle/maven/defaults-maven.gradle +++ b/gradle/maven/defaults-maven.gradle @@ -149,6 +149,12 @@ configure(subprojects.findAll {it.path in rootProject.published}) {prj -> pom(configurePom) + // Publish resolved/locked dependency versions instead of declared catalog versions + versionMapping { + usage('java-api') { fromResolutionOf('runtimeClasspath') } + usage('java-runtime') { fromResolutionResult() } + } + // Remove the internal :platform dependency from dependencyManagement in POMs pom.withXml { def root = asNode() From 6364e486d3cd5158ac60612b0738ca7b1feefbe4 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Wed, 1 Apr 2026 09:03:41 -0400 Subject: [PATCH 2/2] Update changelog/unreleased/SOLR-18185-pomPublishVersions.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- changelog/unreleased/SOLR-18185-pomPublishVersions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/SOLR-18185-pomPublishVersions.yml b/changelog/unreleased/SOLR-18185-pomPublishVersions.yml index 3a732a610eb6..49e811c6dc03 100644 --- a/changelog/unreleased/SOLR-18185-pomPublishVersions.yml +++ b/changelog/unreleased/SOLR-18185-pomPublishVersions.yml @@ -1,4 +1,4 @@ -title: Published POMs are now published with the resolved version. Fixes ambiguous/missing version problems. +title: Published POMs now include resolved dependency versions, fixing ambiguous/missing version problems. type: fixed authors: - name: David Smiley