Skip to content

Commit 4022712

Browse files
sujitharamadasssujitharamadass
authored
Merge pull request #210 from udhayGK/develop
fix: jaxb to jakarta migration and java17 and spring boot3
2 parents a306e6c + 968b892 commit 4022712

File tree

346 files changed

+1518
-1481
lines changed

Some content is hidden

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

346 files changed

+1518
-1481
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The QuickBooks Online Java SDK provides a set of Java class libraries that make
3838
* payments-api - Payments SDK for V2 API, contains methods for charge, echeck, token, card and bank account APIs.
3939

4040
## System Requirements
41-
The SDK works on JDK 1.7 and above.
41+
The SDK works on JDK 17 and above.
4242

4343
## First Use Instructions
4444
1. Clone the GitHub repo to your computer.

‎ipp-v3-java-data/pom.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.intuit.quickbooks-online</groupId>
66
<artifactId>ipp-v3-java-devkit-pom</artifactId>
7-
<version>6.2.4</version>
7+
<version>6.3.0</version>
88
</parent>
99

1010
<artifactId>ipp-v3-java-data</artifactId>
@@ -32,10 +32,15 @@
3232
<artifactId>jackson-annotations</artifactId>
3333
<version>2.9.10</version>
3434
</dependency>
35+
<dependency>
36+
<groupId>jakarta.xml.bind</groupId>
37+
<artifactId>jakarta.xml.bind-api</artifactId>
38+
<version>4.0.0</version>
39+
</dependency>
3540
<dependency>
3641
<groupId>org.glassfish.jaxb</groupId>
3742
<artifactId>jaxb-runtime</artifactId>
38-
<version>2.3.1</version>
43+
<version>4.0.3</version>
3944
</dependency>
4045
</dependencies>
4146

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
import java.util.ArrayList;
1414
import java.util.Date;
1515
import java.util.List;
16-
import javax.xml.bind.annotation.XmlAccessType;
17-
import javax.xml.bind.annotation.XmlAccessorType;
18-
import javax.xml.bind.annotation.XmlElement;
19-
import javax.xml.bind.annotation.XmlSchemaType;
20-
import javax.xml.bind.annotation.XmlSeeAlso;
21-
import javax.xml.bind.annotation.XmlType;
22-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
16+
import jakarta.xml.bind.annotation.XmlAccessType;
17+
import jakarta.xml.bind.annotation.XmlAccessorType;
18+
import jakarta.xml.bind.annotation.XmlElement;
19+
import jakarta.xml.bind.annotation.XmlSchemaType;
20+
import jakarta.xml.bind.annotation.XmlSeeAlso;
21+
import jakarta.xml.bind.annotation.XmlType;
22+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
2323
import com.intuit.sb.cdm.util.v3.DateAdapter;
2424
import org.jvnet.jaxb2_commons.lang.Equals2;
2525
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
import java.io.Serializable;
1212
import java.math.BigDecimal;
13-
import javax.xml.bind.annotation.XmlAccessType;
14-
import javax.xml.bind.annotation.XmlAccessorType;
15-
import javax.xml.bind.annotation.XmlElement;
16-
import javax.xml.bind.annotation.XmlSchemaType;
17-
import javax.xml.bind.annotation.XmlType;
13+
import jakarta.xml.bind.annotation.XmlAccessType;
14+
import jakarta.xml.bind.annotation.XmlAccessorType;
15+
import jakarta.xml.bind.annotation.XmlElement;
16+
import jakarta.xml.bind.annotation.XmlSchemaType;
17+
import jakarta.xml.bind.annotation.XmlType;
1818
import org.jvnet.jaxb2_commons.lang.Equals2;
1919
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
2020
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountSubTypeEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountTypeEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AcquiredAsEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AdvancedInventoryPrefs.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
import java.io.Serializable;
1212
import java.util.Date;
13-
import javax.xml.bind.annotation.XmlAccessType;
14-
import javax.xml.bind.annotation.XmlAccessorType;
15-
import javax.xml.bind.annotation.XmlElement;
16-
import javax.xml.bind.annotation.XmlSchemaType;
17-
import javax.xml.bind.annotation.XmlType;
18-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
13+
import jakarta.xml.bind.annotation.XmlAccessType;
14+
import jakarta.xml.bind.annotation.XmlAccessorType;
15+
import jakarta.xml.bind.annotation.XmlElement;
16+
import jakarta.xml.bind.annotation.XmlSchemaType;
17+
import jakarta.xml.bind.annotation.XmlType;
18+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
1919
import com.intuit.sb.cdm.util.v3.DateAdapter;
2020
import org.jvnet.jaxb2_commons.lang.Equals2;
2121
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AgencyPaymentMethodEnum.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlType;
1313

1414

1515
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attachable.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.annotation.XmlAccessType;
13-
import javax.xml.bind.annotation.XmlAccessorType;
14-
import javax.xml.bind.annotation.XmlElement;
15-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.annotation.XmlAccessType;
13+
import jakarta.xml.bind.annotation.XmlAccessorType;
14+
import jakarta.xml.bind.annotation.XmlElement;
15+
import jakarta.xml.bind.annotation.XmlType;
1616
import org.jvnet.jaxb2_commons.lang.Equals2;
1717
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
1818
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableCategoryEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableRef.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import java.io.Serializable;
1212
import java.util.ArrayList;
1313
import java.util.List;
14-
import javax.xml.bind.annotation.XmlAccessType;
15-
import javax.xml.bind.annotation.XmlAccessorType;
16-
import javax.xml.bind.annotation.XmlElement;
17-
import javax.xml.bind.annotation.XmlType;
14+
import jakarta.xml.bind.annotation.XmlAccessType;
15+
import jakarta.xml.bind.annotation.XmlAccessorType;
16+
import jakarta.xml.bind.annotation.XmlElement;
17+
import jakarta.xml.bind.annotation.XmlType;
1818
import org.jvnet.jaxb2_commons.lang.Equals2;
1919
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
2020
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AttachableResponse.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.annotation.XmlAccessType;
13-
import javax.xml.bind.annotation.XmlAccessorType;
14-
import javax.xml.bind.annotation.XmlElement;
15-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.annotation.XmlAccessType;
13+
import jakarta.xml.bind.annotation.XmlAccessorType;
14+
import jakarta.xml.bind.annotation.XmlElement;
15+
import jakarta.xml.bind.annotation.XmlType;
1616
import org.jvnet.jaxb2_commons.lang.Equals2;
1717
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
1818
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attribute.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.annotation.XmlAccessType;
13-
import javax.xml.bind.annotation.XmlAccessorType;
14-
import javax.xml.bind.annotation.XmlElement;
15-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.annotation.XmlAccessType;
13+
import jakarta.xml.bind.annotation.XmlAccessorType;
14+
import jakarta.xml.bind.annotation.XmlElement;
15+
import jakarta.xml.bind.annotation.XmlType;
1616
import org.jvnet.jaxb2_commons.lang.Equals2;
1717
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
1818
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Attributes.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import java.io.Serializable;
1212
import java.util.ArrayList;
1313
import java.util.List;
14-
import javax.xml.bind.annotation.XmlAccessType;
15-
import javax.xml.bind.annotation.XmlAccessorType;
16-
import javax.xml.bind.annotation.XmlElement;
17-
import javax.xml.bind.annotation.XmlType;
14+
import jakarta.xml.bind.annotation.XmlAccessType;
15+
import jakarta.xml.bind.annotation.XmlAccessorType;
16+
import jakarta.xml.bind.annotation.XmlElement;
17+
import jakarta.xml.bind.annotation.XmlType;
1818
import org.jvnet.jaxb2_commons.lang.Equals2;
1919
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
2020
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemRequest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.JAXBElement;
13-
import javax.xml.bind.annotation.XmlAccessType;
14-
import javax.xml.bind.annotation.XmlAccessorType;
15-
import javax.xml.bind.annotation.XmlAttribute;
16-
import javax.xml.bind.annotation.XmlElement;
17-
import javax.xml.bind.annotation.XmlElementRef;
18-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.JAXBElement;
13+
import jakarta.xml.bind.annotation.XmlAccessType;
14+
import jakarta.xml.bind.annotation.XmlAccessorType;
15+
import jakarta.xml.bind.annotation.XmlAttribute;
16+
import jakarta.xml.bind.annotation.XmlElement;
17+
import jakarta.xml.bind.annotation.XmlElementRef;
18+
import jakarta.xml.bind.annotation.XmlType;
1919
import org.jvnet.jaxb2_commons.lang.Equals2;
2020
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
2121
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BatchItemResponse.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.JAXBElement;
13-
import javax.xml.bind.annotation.XmlAccessType;
14-
import javax.xml.bind.annotation.XmlAccessorType;
15-
import javax.xml.bind.annotation.XmlAttribute;
16-
import javax.xml.bind.annotation.XmlElement;
17-
import javax.xml.bind.annotation.XmlElementRef;
18-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.JAXBElement;
13+
import jakarta.xml.bind.annotation.XmlAccessType;
14+
import jakarta.xml.bind.annotation.XmlAccessorType;
15+
import jakarta.xml.bind.annotation.XmlAttribute;
16+
import jakarta.xml.bind.annotation.XmlElement;
17+
import jakarta.xml.bind.annotation.XmlElementRef;
18+
import jakarta.xml.bind.annotation.XmlType;
1919
import org.jvnet.jaxb2_commons.lang.Equals2;
2020
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
2121
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Bill.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import java.io.Serializable;
1212
import java.math.BigDecimal;
1313
import java.util.Date;
14-
import javax.xml.bind.annotation.XmlAccessType;
15-
import javax.xml.bind.annotation.XmlAccessorType;
16-
import javax.xml.bind.annotation.XmlElement;
17-
import javax.xml.bind.annotation.XmlSchemaType;
18-
import javax.xml.bind.annotation.XmlType;
19-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
14+
import jakarta.xml.bind.annotation.XmlAccessType;
15+
import jakarta.xml.bind.annotation.XmlAccessorType;
16+
import jakarta.xml.bind.annotation.XmlElement;
17+
import jakarta.xml.bind.annotation.XmlSchemaType;
18+
import jakarta.xml.bind.annotation.XmlType;
19+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
2020
import com.intuit.sb.cdm.util.v3.DateAdapter;
2121
import org.jvnet.jaxb2_commons.lang.Equals2;
2222
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPayment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
import java.io.Serializable;
1212
import java.math.BigDecimal;
13-
import javax.xml.bind.annotation.XmlAccessType;
14-
import javax.xml.bind.annotation.XmlAccessorType;
15-
import javax.xml.bind.annotation.XmlElement;
16-
import javax.xml.bind.annotation.XmlSchemaType;
17-
import javax.xml.bind.annotation.XmlType;
13+
import jakarta.xml.bind.annotation.XmlAccessType;
14+
import jakarta.xml.bind.annotation.XmlAccessorType;
15+
import jakarta.xml.bind.annotation.XmlElement;
16+
import jakarta.xml.bind.annotation.XmlSchemaType;
17+
import jakarta.xml.bind.annotation.XmlType;
1818
import org.jvnet.jaxb2_commons.lang.Equals2;
1919
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
2020
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCheck.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.annotation.XmlAccessType;
13-
import javax.xml.bind.annotation.XmlAccessorType;
14-
import javax.xml.bind.annotation.XmlElement;
15-
import javax.xml.bind.annotation.XmlSchemaType;
16-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.annotation.XmlAccessType;
13+
import jakarta.xml.bind.annotation.XmlAccessorType;
14+
import jakarta.xml.bind.annotation.XmlElement;
15+
import jakarta.xml.bind.annotation.XmlSchemaType;
16+
import jakarta.xml.bind.annotation.XmlType;
1717
import org.jvnet.jaxb2_commons.lang.Equals2;
1818
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
1919
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentCreditCard.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
package com.intuit.ipp.data;
1010

1111
import java.io.Serializable;
12-
import javax.xml.bind.annotation.XmlAccessType;
13-
import javax.xml.bind.annotation.XmlAccessorType;
14-
import javax.xml.bind.annotation.XmlElement;
15-
import javax.xml.bind.annotation.XmlType;
12+
import jakarta.xml.bind.annotation.XmlAccessType;
13+
import jakarta.xml.bind.annotation.XmlAccessorType;
14+
import jakarta.xml.bind.annotation.XmlElement;
15+
import jakarta.xml.bind.annotation.XmlType;
1616
import org.jvnet.jaxb2_commons.lang.Equals2;
1717
import org.jvnet.jaxb2_commons.lang.EqualsStrategy2;
1818
import org.jvnet.jaxb2_commons.lang.HashCode2;

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillPaymentTypeEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

‎ipp-v3-java-data/src/main/java/com/intuit/ipp/data/BillableStatusEnum.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package com.intuit.ipp.data;
1010

11-
import javax.xml.bind.annotation.XmlEnum;
12-
import javax.xml.bind.annotation.XmlEnumValue;
13-
import javax.xml.bind.annotation.XmlType;
11+
import jakarta.xml.bind.annotation.XmlEnum;
12+
import jakarta.xml.bind.annotation.XmlEnumValue;
13+
import jakarta.xml.bind.annotation.XmlType;
1414

1515

1616
/**

0 commit comments

Comments
 (0)