From 902603db0f5717972c57e312b1c605dff9c1ec6c Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Mon, 16 Feb 2026 13:05:59 +0000 Subject: [PATCH 1/2] feat: Use Jakarta BOM for Jakarta EE dependcencies --- boms/sdk/pom.xml | 46 ++++++++++++++++++++++++---------------------- pom.xml | 28 ++-------------------------- 2 files changed, 26 insertions(+), 48 deletions(-) diff --git a/boms/sdk/pom.xml b/boms/sdk/pom.xml index 9cdc502eb..715cdbedf 100644 --- a/boms/sdk/pom.xml +++ b/boms/sdk/pom.xml @@ -131,6 +131,13 @@ + + jakarta.platform + jakarta.jakartaee-bom + ${jakarta.platform.version} + pom + import + io.grpc grpc-bom @@ -157,31 +164,14 @@ mutiny-zero ${mutiny-zero.version} - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi-api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.jakarta.inject-api.version} - - - jakarta.json - jakarta.json-api - ${jakarta.json-api.version} - provided - - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs-api.version} - provided + com.google.code.gson + gson + ${gson.version} + + org.jspecify @@ -191,6 +181,12 @@ + + org.junit.jupiter + junit-jupiter + ${junit.version} + test + org.junit.jupiter junit-jupiter-api @@ -209,6 +205,12 @@ ${mockito-core.version} test + + org.mockito + mockito-junit-jupiter + ${mockito-core.version} + test + org.mock-server mockserver-netty diff --git a/pom.xml b/pom.xml index 5ed76528b..4c9320e95 100644 --- a/pom.xml +++ b/pom.xml @@ -52,10 +52,6 @@ 0.8.0 5.0.3 2.13.2 - 4.1.0 - 2.0.1 - 2.1.3 - 3.1.0 5.13.4 1.6.3 1.52.0 @@ -65,6 +61,7 @@ 1.7.1 4.33.1 0.6.1 + 10.0.0 3.30.6 5.5.1 2.0.17 @@ -261,16 +258,7 @@ mutiny-zero ${mutiny-zero.version} - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi-api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.jakarta.inject-api.version} - + org.mapstruct mapstruct @@ -281,18 +269,6 @@ mapstruct-processor ${mapstruct.version} - - jakarta.json - jakarta.json-api - ${jakarta.json-api.version} - provided - - - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs-api.version} - provided - org.junit.jupiter junit-jupiter-api From 08d8291869936f6f387f99202bc279623f7af6f3 Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Mon, 16 Feb 2026 15:25:55 +0000 Subject: [PATCH 2/2] Try to redefine artifacts --- boms/sdk/pom.xml | 21 ++++++++++++++++++++- reference/jsonrpc/pom.xml | 5 +++++ reference/rest/pom.xml | 5 +++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/boms/sdk/pom.xml b/boms/sdk/pom.xml index 715cdbedf..6b8ec4665 100644 --- a/boms/sdk/pom.xml +++ b/boms/sdk/pom.xml @@ -170,7 +170,26 @@ ${gson.version} - + + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + + jakarta.inject + jakarta.inject-api + + + jakarta.json + jakarta.json-api + provided + + + jakarta.ws.rs + jakarta.ws.rs-api + provided + diff --git a/reference/jsonrpc/pom.xml b/reference/jsonrpc/pom.xml index e099711a3..e905ec84c 100644 --- a/reference/jsonrpc/pom.xml +++ b/reference/jsonrpc/pom.xml @@ -63,6 +63,11 @@ jakarta.inject jakarta.inject-api + + jakarta.ws.rs + jakarta.ws.rs-api + provided + org.slf4j slf4j-api diff --git a/reference/rest/pom.xml b/reference/rest/pom.xml index a82b2278f..bce572d04 100644 --- a/reference/rest/pom.xml +++ b/reference/rest/pom.xml @@ -73,6 +73,11 @@ jakarta.inject jakarta.inject-api + + jakarta.ws.rs + jakarta.ws.rs-api + provided + org.slf4j slf4j-api