Skip to content

Commit 0fbe85f

Browse files
diana-derosediana-derose
authored
Merge pull request #9 from diana-derose/develop
changes for v2.9.1
2 parents 571ae7d + 32139d5 commit 0fbe85f

File tree

95 files changed

+540
-507
lines changed

Some content is hidden

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

95 files changed

+540
-507
lines changed

‎ipp-java-qbapihelper/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<parent>
2222
<artifactId>ipp-v3-java-devkit-pom</artifactId>
2323
<groupId>com.intuit.quickbooks-online</groupId>
24-
<version>2.9.0</version>
24+
<version>2.9.1</version>
2525
</parent>
2626
<artifactId>ipp-java-qbapihelper</artifactId>
27-
<version>2.9.0</version>
27+
<version>2.9.1</version>
2828
<packaging>jar</packaging>
2929
<name>Quickbooks API Helper for Oauth</name>
3030
<description>Quickbooks API Helper Project for OAuth, Disconnect and Reconnect</description>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<parent>
55
<groupId>com.intuit.quickbooks-online</groupId>
66
<artifactId>ipp-v3-java-devkit-pom</artifactId>
7-
<version>2.9.0</version>
7+
<version>2.9.1</version>
88
</parent>
99

1010
<artifactId>ipp-v3-java-data</artifactId>
1111
<name>IPP V3 Java - Data Project</name>
1212
<description>IPP Java V3 DevKit Data project - FMS Entities generation</description>
13-
<version>2.9.0</version>
13+
<version>2.9.1</version>
1414

1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,15 +40,15 @@
4040
<scope>test</scope>
4141
</dependency>
4242
<dependency>
43-
<groupId>org.codehaus.jackson</groupId>
44-
<artifactId>jackson-core-asl</artifactId>
45-
<version>1.9.13</version>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-core</artifactId>
45+
<version>2.8.8</version>
4646
</dependency>
4747
<dependency>
48-
<groupId>org.codehaus.jackson</groupId>
49-
<artifactId>jackson-mapper-asl</artifactId>
50-
<version>1.9.13</version>
51-
</dependency>
48+
<groupId>com.fasterxml.jackson.core</groupId>
49+
<artifactId>jackson-databind</artifactId>
50+
<version>2.8.8</version>
51+
</dependency>
5252
</dependencies>
5353

5454
<build>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.List;
1919

20-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
20+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2121

2222
@JsonIgnoreProperties(ignoreUnknown = true)
2323
public class DataChangeEvent {
@@ -34,3 +34,4 @@ public void setEntities(List<Entity> entities) {
3434

3535

3636
}
37+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*******************************************************************************/
1616
package com.intuit.ipp.data;
1717

18-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
18+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1919

2020
@JsonIgnoreProperties(ignoreUnknown = true)
2121
public class Entity {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*******************************************************************************/
1616
package com.intuit.ipp.data;
1717

18-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
18+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1919

2020
@JsonIgnoreProperties(ignoreUnknown = true)
2121
public class EventNotification {
@@ -38,3 +38,4 @@ public void setDataChangeEvent(DataChangeEvent dataChangeEvent) {
3838

3939

4040
}
41+

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.List;
1919

20-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
20+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2121

2222
/**
2323
* Wrapper class for the webhooks payload
@@ -37,3 +37,4 @@ public void setEventNotifications(List<EventNotification> eventNotifications) {
3737
}
3838

3939
}
40+

‎ipp-v3-java-devkit-assembly/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<parent>
1616
<groupId>com.intuit.quickbooks-online</groupId>
1717
<artifactId>ipp-v3-java-devkit-pom</artifactId>
18-
<version>2.9.0</version>
18+
<version>2.9.1</version>
1919
</parent>
2020

2121
<artifactId>ipp-v3-java-devkit-assembly</artifactId>
2222
<packaging>pom</packaging>
2323
<name>IPP Java Devkit Assembly (${project.version})</name>
2424
<description>IPP Java V3 DevKit assembly</description>
25-
<version>2.9.0</version>
25+
<version>2.9.1</version>
2626
<properties>
27-
<release.devkit.version>2.9.0</release.devkit.version>
28-
<release.data.version>2.9.0</release.data.version>
27+
<release.devkit.version>2.9.1</release.devkit.version>
28+
<release.data.version>2.9.1</release.data.version>
2929
</properties>
3030
<dependencies>
3131
<!-- Main artifacts -->

‎ipp-v3-java-devkit-shaded-assembly/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<parent>
1616
<groupId>com.intuit.quickbooks-online</groupId>
1717
<artifactId>ipp-v3-java-devkit-pom</artifactId>
18-
<version>2.9.0</version>
18+
<version>2.9.1</version>
1919
</parent>
2020

2121
<artifactId>ipp-v3-java-devkit-shaded-assembly</artifactId>
2222
<packaging>pom</packaging>
2323
<name>IPP Java Devkit Assembly Shaded (${project.version})</name>
2424
<description>IPP Java V3 DevKit assembly</description>
25-
<version>2.9.0</version>
25+
<version>2.9.1</version>
2626
<properties>
27-
<release.devkit.version>2.9.0</release.devkit.version>
28-
<release.data.version>2.9.0</release.data.version>
27+
<release.devkit.version>2.9.1</release.devkit.version>
28+
<release.data.version>2.9.1</release.data.version>
2929
</properties>
3030
<dependencies>
3131
<!-- Main artifacts -->

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>ipp-v3-java-devkit-pom</artifactId>
88
<groupId>com.intuit.quickbooks-online</groupId>
9-
<version>2.9.0</version>
9+
<version>2.9.1</version>
1010
</parent>
1111

1212
<artifactId>ipp-v3-java-devkit</artifactId>
13-
<version>2.9.0</version>
13+
<version>2.9.1</version>
1414
<packaging>jar</packaging>
1515
<name>IPP V3 Java Devkit - Development Project</name>
1616
<description>IPP Java V3 DevKit Project - Core</description>
@@ -22,22 +22,22 @@
2222
</properties>
2323

2424
<dependencies>
25-
<dependency>
25+
<dependency>
2626
<groupId>com.intuit.quickbooks-online</groupId>
2727
<artifactId>ipp-v3-java-data</artifactId>
28-
<version>2.9.0</version>
28+
<version>2.9.1</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>javax.xml.bind</groupId>
32+
<artifactId>jaxb-api</artifactId>
33+
<version>2.2.6</version>
2934
</dependency>
30-
<dependency>
31-
<groupId>javax.xml.bind</groupId>
32-
<artifactId>jaxb-api</artifactId>
33-
<version>2.2.6</version>
34-
</dependency>
3535
<dependency>
36-
<groupId>org.testng</groupId>
37-
<artifactId>testng</artifactId>
38-
<version>6.9.10</version>
39-
<scope>test</scope>
40-
</dependency>
36+
<groupId>org.testng</groupId>
37+
<artifactId>testng</artifactId>
38+
<version>6.9.10</version>
39+
<scope>test</scope>
40+
</dependency>
4141
</dependencies>
4242

4343
<build>

‎ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@ private boolean isKeyValueExpected(String key) {
431431
|| key.equals(RequestElements.REPORT_PARAM_QZURL)
432432
|| key.equals(RequestElements.REPORT_PARAM_AGING_PERIOD)
433433
|| key.equals(RequestElements.REPORT_PARAM_NUM_PERIOD)
434-
|| key.equals(RequestElements.REPORT_PARAM_REPORT_DT);
434+
|| key.equals(RequestElements.REPORT_PARAM_REPORT_DT)
435+
|| key.equals(RequestElements.REPORT_PARAM_COLUMNS);
435436
}
436437

437438
/**

0 commit comments

Comments
 (0)