Skip to content

Migrate the project to use the Jakarta API making it compatible with recent Java versions or newer framework versions #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Migrate the project to use the Jakarta API making it compatible with recent Java versions or newer framework versions #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/bandwidth/iris/sdk/model/A2pSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/ActivationStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/ActivationStatusResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/AddedEmergencyNotificationGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifierResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifiersResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/AreaCodeSearchAndOrderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/AssignedNnRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/AvailableNpaNxx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/bandwidth/iris/sdk/model/BaseOrderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/bandwidth/iris/sdk/model/BaseResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/BasicAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/CallbackCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/CallbackSubscription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/CallingName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/City.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/CityResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/CitySearchAndOrderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/CombinedSearchAndOrderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/CoveredRateCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/CoveredRateCenters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/Credentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/Csr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/CsrData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/CsrResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.bandwidth.iris.sdk.model;

import javax.xml.bind.annotation.*;
import jakarta.xml.bind.annotation.*;


@XmlRootElement(name="CsrResponse")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/DeletedEmergencyNotificationGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bandwidth/iris/sdk/model/DisconnectTelephoneNumberOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bandwidth/iris/sdk/model/DisconnectTelephoneNumberOrderResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading
Loading