Merge pull request #78 from bmariesan/jakarta-api-migration

Migrate the project to use the Jakarta API making it compatible with recent Java versions or newer framework versions
Bandwidth · Jan 6, 2025 · 0f4d2aa · 0f4d2aa
2 parents ff96793 + 105d46d
commit 0f4d2aa
Show file tree

Hide file tree

Showing 146 changed files with 392 additions and 409 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,14 +38,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.6</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>3.0.1</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -114,9 +114,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
+            <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
-            <version>1.47</version>
+            <version>3.10.0</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/A2pSettings.java b/src/main/java/com/bandwidth/iris/sdk/model/A2pSettings.java
@@ -1,7 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
-import java.util.List;
+import jakarta.xml.bind.annotation.*;
 
 @XmlRootElement(name = "A2pSettings")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/ActivationStatus.java b/src/main/java/com/bandwidth/iris/sdk/model/ActivationStatus.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/ActivationStatusResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/ActivationStatusResponse.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "ActivationStatusResponse")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AddedEmergencyNotificationGroup.java b/src/main/java/com/bandwidth/iris/sdk/model/AddedEmergencyNotificationGroup.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.List;
 
 @XmlRootElement(name = "AddedEmergencyNotificationGroup")

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/Address.java b/src/main/java/com/bandwidth/iris/sdk/model/Address.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Address")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifier.java b/src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifier.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "AlternateEndUserIdentifier")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifierResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifierResponse.java
@@ -1,7 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
-import java.util.List;
+import jakarta.xml.bind.annotation.*;
 
 @XmlRootElement(name = "AlternateEndUserIdentifierResponse")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifiersResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifiersResponse.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.List;
 
 @XmlRootElement(name = "AlternateEndUserIdentifiersResponse")

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AreaCodeSearchAndOrderType.java b/src/main/java/com/bandwidth/iris/sdk/model/AreaCodeSearchAndOrderType.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "AreaCodeSearchAndOrderType")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AssignedNnRoute.java b/src/main/java/com/bandwidth/iris/sdk/model/AssignedNnRoute.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 
 @XmlRootElement(name = "AssignedNnRoute")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AvailableNpaNxx.java b/src/main/java/com/bandwidth/iris/sdk/model/AvailableNpaNxx.java
@@ -5,10 +5,10 @@
 import com.bandwidth.iris.sdk.IrisResponse;
 import com.bandwidth.iris.sdk.utils.XmlUtils;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/BaseOrderType.java b/src/main/java/com/bandwidth/iris/sdk/model/BaseOrderType.java
@@ -1,8 +1,8 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class BaseOrderType {

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/BaseResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/BaseResponse.java
@@ -1,8 +1,8 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class BaseResponse {

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/BasicAuthentication.java b/src/main/java/com/bandwidth/iris/sdk/model/BasicAuthentication.java
@@ -1,10 +1,10 @@
 package com.bandwidth.iris.sdk.model;
 
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "BasicAuthentication")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CallbackCredentials.java b/src/main/java/com/bandwidth/iris/sdk/model/CallbackCredentials.java
@@ -2,10 +2,10 @@
 
 
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CallbackCredentials")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CallbackSubscription.java b/src/main/java/com/bandwidth/iris/sdk/model/CallbackSubscription.java
@@ -1,10 +1,10 @@
 package com.bandwidth.iris.sdk.model;
 
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CallbackSubscription")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CallingName.java b/src/main/java/com/bandwidth/iris/sdk/model/CallingName.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CallingName")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/City.java b/src/main/java/com/bandwidth/iris/sdk/model/City.java
@@ -3,10 +3,10 @@
 import com.bandwidth.iris.sdk.IrisClient;
 import com.bandwidth.iris.sdk.IrisPath;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CityResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/CityResponse.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CitySearchAndOrderType.java b/src/main/java/com/bandwidth/iris/sdk/model/CitySearchAndOrderType.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CitySearchAndOrderType")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CombinedSearchAndOrderType.java b/src/main/java/com/bandwidth/iris/sdk/model/CombinedSearchAndOrderType.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CombinedSearchAndOrderType")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CoveredRateCenter.java b/src/main/java/com/bandwidth/iris/sdk/model/CoveredRateCenter.java
@@ -3,7 +3,7 @@
 import com.bandwidth.iris.sdk.IrisClient;
 import com.bandwidth.iris.sdk.IrisPath;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CoveredRateCenters.java b/src/main/java/com/bandwidth/iris/sdk/model/CoveredRateCenters.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/Credentials.java b/src/main/java/com/bandwidth/iris/sdk/model/Credentials.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Credentials")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/Csr.java b/src/main/java/com/bandwidth/iris/sdk/model/Csr.java
@@ -4,10 +4,10 @@
 import com.bandwidth.iris.sdk.IrisPath;
 import com.bandwidth.iris.sdk.IrisResponse;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 
 @XmlRootElement(name="Csr")

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CsrData.java b/src/main/java/com/bandwidth/iris/sdk/model/CsrData.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 
 @XmlRootElement(name="CsrData")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/CsrResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/CsrResponse.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 
 
 @XmlRootElement(name="CsrResponse")

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/DeletedEmergencyNotificationGroup.java b/src/main/java/com/bandwidth/iris/sdk/model/DeletedEmergencyNotificationGroup.java
@@ -1,9 +1,9 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "DeletedEmergencyNotificationGroup")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/DisconnectTelephoneNumberOrder.java b/src/main/java/com/bandwidth/iris/sdk/model/DisconnectTelephoneNumberOrder.java
@@ -3,10 +3,10 @@
 import com.bandwidth.iris.sdk.IrisClient;
 import com.bandwidth.iris.sdk.IrisPath;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "DisconnectTelephoneNumberOrder")
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/src/main/java/com/bandwidth/iris/sdk/model/DisconnectTelephoneNumberOrderResponse.java b/src/main/java/com/bandwidth/iris/sdk/model/DisconnectTelephoneNumberOrderResponse.java
@@ -1,6 +1,6 @@
 package com.bandwidth.iris.sdk.model;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;