Skip to content

Commit 0f4d2aa

Browse files
brianluisgomezbrianluisgomez
authored
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
2 parents ff96793 + 105d46d commit 0f4d2aa

File tree

146 files changed

+392
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+392
-409
lines changed

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838

3939
<dependencies>
4040
<dependency>
41-
<groupId>org.glassfish.jaxb</groupId>
42-
<artifactId>jaxb-runtime</artifactId>
43-
<version>2.3.6</version>
41+
<groupId>jakarta.xml.bind</groupId>
42+
<artifactId>jakarta.xml.bind-api</artifactId>
43+
<version>3.0.1</version>
4444
</dependency>
4545
<dependency>
46-
<groupId>javax.xml.bind</groupId>
47-
<artifactId>jaxb-api</artifactId>
48-
<version>2.3.1</version>
46+
<groupId>org.glassfish.jaxb</groupId>
47+
<artifactId>jaxb-runtime</artifactId>
48+
<version>3.0.2</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.sun.xml.bind</groupId>
@@ -114,9 +114,9 @@
114114
<scope>test</scope>
115115
</dependency>
116116
<dependency>
117-
<groupId>com.github.tomakehurst</groupId>
117+
<groupId>org.wiremock</groupId>
118118
<artifactId>wiremock</artifactId>
119-
<version>1.47</version>
119+
<version>3.10.0</version>
120120
<scope>test</scope>
121121
</dependency>
122122

‎src/main/java/com/bandwidth/iris/sdk/model/A2pSettings.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.*;
4-
import java.util.List;
3+
import jakarta.xml.bind.annotation.*;
54

65
@XmlRootElement(name = "A2pSettings")
76
@XmlAccessorType(XmlAccessType.FIELD)

‎src/main/java/com/bandwidth/iris/sdk/model/ActivationStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.*;
3+
import jakarta.xml.bind.annotation.*;
44
import java.util.ArrayList;
55
import java.util.Date;
66
import java.util.List;

‎src/main/java/com/bandwidth/iris/sdk/model/ActivationStatusResponse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlElement;
6-
import javax.xml.bind.annotation.XmlRootElement;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlElement;
6+
import jakarta.xml.bind.annotation.XmlRootElement;
77

88
@XmlRootElement(name = "ActivationStatusResponse")
99
@XmlAccessorType(XmlAccessType.FIELD)

‎src/main/java/com/bandwidth/iris/sdk/model/AddedEmergencyNotificationGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.*;
3+
import jakarta.xml.bind.annotation.*;
44
import java.util.List;
55

66
@XmlRootElement(name = "AddedEmergencyNotificationGroup")

‎src/main/java/com/bandwidth/iris/sdk/model/Address.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlElement;
6-
import javax.xml.bind.annotation.XmlRootElement;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlElement;
6+
import jakarta.xml.bind.annotation.XmlRootElement;
77

88
@XmlRootElement(name = "Address")
99
@XmlAccessorType(XmlAccessType.FIELD)

‎src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifier.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlElement;
6-
import javax.xml.bind.annotation.XmlRootElement;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlElement;
6+
import jakarta.xml.bind.annotation.XmlRootElement;
77

88
@XmlRootElement(name = "AlternateEndUserIdentifier")
99
@XmlAccessorType(XmlAccessType.FIELD)

‎src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifierResponse.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.*;
4-
import java.util.List;
3+
import jakarta.xml.bind.annotation.*;
54

65
@XmlRootElement(name = "AlternateEndUserIdentifierResponse")
76
@XmlAccessorType(XmlAccessType.FIELD)

‎src/main/java/com/bandwidth/iris/sdk/model/AlternateEndUserIdentifiersResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.*;
3+
import jakarta.xml.bind.annotation.*;
44
import java.util.List;
55

66
@XmlRootElement(name = "AlternateEndUserIdentifiersResponse")

‎src/main/java/com/bandwidth/iris/sdk/model/AreaCodeSearchAndOrderType.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.bandwidth.iris.sdk.model;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlElement;
6-
import javax.xml.bind.annotation.XmlRootElement;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlElement;
6+
import jakarta.xml.bind.annotation.XmlRootElement;
77

88
@XmlRootElement(name = "AreaCodeSearchAndOrderType")
99
@XmlAccessorType(XmlAccessType.FIELD)

0 commit comments

Comments
 (0)