From 0becb6e9f466de039d5f253b87b4565762762416 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Fri, 17 Jan 2025 19:09:50 +0000 Subject: [PATCH] Update clashing dependencies for shared model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In https://github.com/guardian/content-api/pull/2953 I’m trying to work out a model shared between porter and concierge for the data that’s written to elasticsearch. Making concierge depend on the shared model has lead to some dependency clashes: this commit updates some dependencies here (specifically content-entity and content-atom) to resolve those clashes. --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8d4e9de..e8e91b6 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ import sbtrelease.ReleaseStateTransformations.* import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions -val contentEntityVersion = "3.0.3" -val contentAtomVersion = "4.0.4" +val contentEntityVersion = "4.0.0" +val contentAtomVersion = "6.0.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes