From 143c30b22704b88591fb73444267b91de004df27 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 14 Apr 2026 03:31:52 +0000 Subject: [PATCH 1/2] Initial plan From 2f9c3e06cb5b3b621c08fb3c5370e95d9ea8767b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 14 Apr 2026 03:34:58 +0000 Subject: [PATCH 2/2] migrate JAXB XmlEnum imports to jakarta namespace Agent-Logs-Url: https://github.com/killbill/killbill-api/sessions/959f715f-d8a3-40d5-9981-fc410c178309 Co-authored-by: xsalefter <510438+xsalefter@users.noreply.github.com> --- pom.xml | 12 ++++++++++++ .../org/killbill/billing/catalog/api/Currency.java | 2 +- .../org/killbill/billing/catalog/api/TimeUnit.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d51dc4c..1a5d1cf4 100644 --- a/pom.xml +++ b/pom.xml @@ -41,11 +41,22 @@ true spotbugs-exclude.xml + 2.1.4 + 4.0.4 4.9.8.3 + + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation-api.version} + + + com.fasterxml.jackson.core @@ -54,6 +65,7 @@ jakarta.xml.bind jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} joda-time diff --git a/src/main/java/org/killbill/billing/catalog/api/Currency.java b/src/main/java/org/killbill/billing/catalog/api/Currency.java index eb073c55..b3640bab 100644 --- a/src/main/java/org/killbill/billing/catalog/api/Currency.java +++ b/src/main/java/org/killbill/billing/catalog/api/Currency.java @@ -16,7 +16,7 @@ package org.killbill.billing.catalog.api; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; @XmlEnum public enum Currency { diff --git a/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java b/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java index 097bf4cf..3faf5d04 100644 --- a/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java +++ b/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java @@ -16,7 +16,7 @@ package org.killbill.billing.catalog.api; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; @XmlEnum public enum TimeUnit {