Merge pull request #210 from udhayGK/develop

fix: jaxb to jakarta migration and java17 and spring boot3
intuit · Nov 8, 2023 · 4022712 · 4022712
2 parents a306e6c + 968b892
commit 4022712
Show file tree

Hide file tree

Showing 346 changed files with 1,518 additions and 1,481 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ The QuickBooks Online Java SDK provides a set of Java class libraries that make
 * payments-api - Payments SDK for V2 API, contains methods for charge, echeck, token, card and bank account APIs.
 
 ## System Requirements
-The SDK works on JDK 1.7 and above.
+The SDK works on JDK 17 and above.
 
 ## First Use Instructions
 1. Clone the GitHub repo to your computer.

diff --git a/ipp-v3-java-data/pom.xml b/ipp-v3-java-data/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.intuit.quickbooks-online</groupId>
 		<artifactId>ipp-v3-java-devkit-pom</artifactId>
-		<version>6.2.4</version>
+		<version>6.3.0</version>
 	</parent>
 
 	<artifactId>ipp-v3-java-data</artifactId>
@@ -32,10 +32,15 @@
 			<artifactId>jackson-annotations</artifactId>
 			<version>2.9.10</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>2.3.1</version>
+			<version>4.0.3</version>
 		</dependency>
 	</dependencies>
 

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java
@@ -13,13 +13,13 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import com.intuit.sb.cdm.util.v3.DateAdapter;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java
@@ -10,11 +10,11 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java
@@ -10,12 +10,12 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import com.intuit.sb.cdm.util.v3.DateAdapter;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AgencyPaymentMethodEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AgencyPaymentMethodEnum.java
@@ -8,8 +8,8 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java
@@ -9,10 +9,10 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java
@@ -11,10 +11,10 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java
@@ -9,10 +9,10 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java
@@ -9,10 +9,10 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java
@@ -11,10 +11,10 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java
@@ -9,13 +9,13 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java
@@ -9,13 +9,13 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java
@@ -11,12 +11,12 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import com.intuit.sb.cdm.util.v3.DateAdapter;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java
@@ -10,11 +10,11 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java
@@ -9,11 +9,11 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java
@@ -9,10 +9,10 @@
 package com.intuit.ipp.data;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jvnet.jaxb2_commons.lang.Equals2;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
 import org.jvnet.jaxb2_commons.lang.HashCode2;

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**

diff --git a/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java b/ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java
@@ -8,9 +8,9 @@
 
 package com.intuit.ipp.data;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**