Skip to content

Commit 970f3d3

Browse files
diana-derosediana-derose
authored
Merge pull request #15 from intuit/develop
merge v2.9.3 to master
2 parents 5076fc1 + 5b0206e commit 970f3d3

File tree

1,277 files changed

+18140
-7937
lines changed

Some content is hidden

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

1,277 files changed

+18140
-7937
lines changed

‎ipp-java-qbapihelper/pom.xml‎

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,13 @@
2121
<parent>
2222
<artifactId>ipp-v3-java-devkit-pom</artifactId>
2323
<groupId>com.intuit.quickbooks-online</groupId>
24-
<version>2.9.1</version>
24+
<version>2.9.3</version>
2525
</parent>
2626
<artifactId>ipp-java-qbapihelper</artifactId>
27-
<version>2.9.1</version>
27+
<version>2.9.3</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>
31-
32-
<profiles>
33-
<profile>
34-
<properties>
35-
<test.suite>testng.xml</test.suite>
36-
</properties>
37-
</profile>
38-
</profiles>
3931

4032
<dependencies>
4133
<dependency>
@@ -142,6 +134,51 @@
142134
</execution>
143135
</executions>
144136
</plugin>
137+
145138
</plugins>
146139
</build>
140+
141+
<profiles>
142+
<profile>
143+
<properties>
144+
<test.suite>testng.xml</test.suite>
145+
</properties>
146+
</profile>
147+
<profile>
148+
<id>sign</id>
149+
<build>
150+
<plugins>
151+
<!-- build javadocs jar -->
152+
<plugin>
153+
<groupId>org.apache.maven.plugins</groupId>
154+
<artifactId>maven-javadoc-plugin</artifactId>
155+
<version>2.9</version>
156+
<executions>
157+
<execution>
158+
<id>attach-javadocs</id>
159+
<goals>
160+
<goal>jar</goal>
161+
</goals>
162+
</execution>
163+
</executions>
164+
</plugin>
165+
166+
<!-- build sources jar -->
167+
<plugin>
168+
<groupId>org.apache.maven.plugins</groupId>
169+
<artifactId>maven-source-plugin</artifactId>
170+
<version>2.2.1</version>
171+
<executions>
172+
<execution>
173+
<id>attach-sources</id>
174+
<goals>
175+
<goal>jar-no-fork</goal>
176+
</goals>
177+
</execution>
178+
</executions>
179+
</plugin>
180+
</plugins>
181+
</build>
182+
</profile>
183+
</profiles>
147184
</project>

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

Lines changed: 62 additions & 60 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.1</version>
7+
<version>2.9.3</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.1</version>
13+
<version>2.9.3</version>
1414

1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -52,47 +52,33 @@
5252
</dependencies>
5353

5454
<build>
55-
<plugins>
56-
<!-- build javadocs jar -->
57-
<plugin>
55+
<plugins>
56+
<plugin>
5857
<groupId>org.apache.maven.plugins</groupId>
59-
<artifactId>maven-javadoc-plugin</artifactId>
60-
<version>2.9.1</version>
61-
<executions>
62-
<execution>
63-
<id>attach-javadocs</id>
64-
<goals>
65-
<goal>jar</goal>
66-
</goals>
67-
</execution>
68-
</executions>
69-
</plugin>
70-
<plugin>
71-
<groupId>org.apache.maven.plugins</groupId>
72-
<artifactId>maven-deploy-plugin</artifactId>
73-
<configuration>
74-
<skip>true</skip>
75-
</configuration>
58+
<artifactId>maven-deploy-plugin</artifactId>
59+
<configuration>
60+
<skip>true</skip>
61+
</configuration>
7662
</plugin>
7763

7864
<!-- <plugin>
79-
<groupId>org.apache.maven.plugins</groupId>
80-
<artifactId>maven-javadoc-plugin</artifactId>
81-
<version>2.9.1</version>
82-
<executions>
83-
<execution>
84-
<id>attach-javadocs</id>
85-
<goals>
86-
<goal>jar</goal>
87-
</goals>
88-
<configuration>
89-
<additionalparam>-Xdoclint:none</additionalparam>
90-
</configuration>
91-
</execution>
92-
</executions>
93-
</plugin> -->
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-javadoc-plugin</artifactId>
67+
<version>2.9.1</version>
68+
<executions>
69+
<execution>
70+
<id>attach-javadocs</id>
71+
<goals>
72+
<goal>jar</goal>
73+
</goals>
74+
<configuration>
75+
<additionalparam>-Xdoclint:none</additionalparam>
76+
</configuration>
77+
</execution>
78+
</executions>
79+
</plugin> -->
9480
<!-- commented to avoid regeneration of entities, as the same is not required everytime -->
95-
<!--
81+
<!--
9682
<plugin>
9783
<groupId>org.apache.maven.plugins</groupId>
9884
<artifactId>maven-clean-plugin</artifactId>
@@ -155,31 +141,47 @@
155141
</configuration>
156142
</execution>
157143
</executions>
158-
</plugin> -->
144+
</plugin> -->
159145
</plugins>
160146
</build>
161147

162-
<profiles>
163-
<profile>
164-
<id>doclint-java8-disable</id>
165-
<activation>
166-
<jdk>[1.8,)</jdk>
167-
</activation>
168-
169-
<build>
170-
<plugins>
171-
<plugin>
172-
<groupId>org.apache.maven.plugins</groupId>
173-
<artifactId>maven-javadoc-plugin</artifactId>
174-
<configuration>
175-
<additionalparam>-Xdoclint:none</additionalparam>
176-
</configuration>
177-
</plugin>
148+
<profiles>
149+
<profile>
150+
<id>sign</id>
151+
<build>
152+
<plugins>
153+
<!-- build javadocs jar -->
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-javadoc-plugin</artifactId>
157+
<version>2.9</version>
158+
<executions>
159+
<execution>
160+
<id>attach-javadocs</id>
161+
<goals>
162+
<goal>jar</goal>
163+
</goals>
164+
</execution>
165+
</executions>
166+
</plugin>
178167

179-
180-
</plugins>
181-
</build>
182-
</profile>
183-
</profiles>
168+
<!-- build sources jar -->
169+
<plugin>
170+
<groupId>org.apache.maven.plugins</groupId>
171+
<artifactId>maven-source-plugin</artifactId>
172+
<version>2.2.1</version>
173+
<executions>
174+
<execution>
175+
<id>attach-sources</id>
176+
<goals>
177+
<goal>jar-no-fork</goal>
178+
</goals>
179+
</execution>
180+
</executions>
181+
</plugin>
182+
</plugins>
183+
</build>
184+
</profile>
185+
</profiles>
184186

185187
</project>

‎ipp-v3-java-data/src/main/java/META-INF/sun-jaxb.episode‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
66
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
77
Any modifications to this file will be lost upon recompilation of the source schema.
8-
Generated on: 2016.04.13 at 10:49:20 AM PDT
8+
Generated on: 2017.06.06 at 02:08:21 PM PDT
99
1010
-->
1111
<bindings scd="x-schema::tns" xmlns:tns="http://schema.intuit.com/finance/v3">
@@ -75,6 +75,9 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
7575
<bindings scd="~tns:Term">
7676
<class ref="com.intuit.ipp.data.Term"/>
7777
</bindings>
78+
<bindings scd="~tns:CustomerType">
79+
<class ref="com.intuit.ipp.data.CustomerType"/>
80+
</bindings>
7881
<bindings scd="~tns:CustomFieldDefinition">
7982
<class ref="com.intuit.ipp.data.CustomFieldDefinition"/>
8083
</bindings>
@@ -207,6 +210,9 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
207210
<bindings scd="~tns:Attachable">
208211
<class ref="com.intuit.ipp.data.Attachable"/>
209212
</bindings>
213+
<bindings scd="~tns:TaxReturn">
214+
<class ref="com.intuit.ipp.data.TaxReturn"/>
215+
</bindings>
210216
<bindings scd="~tns:Fault">
211217
<class ref="com.intuit.ipp.data.Fault"/>
212218
</bindings>
@@ -276,6 +282,9 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
276282
<bindings scd="~tns:PriceLevelPerItem">
277283
<class ref="com.intuit.ipp.data.PriceLevelPerItem"/>
278284
</bindings>
285+
<bindings scd="~tns:StatusInfo">
286+
<class ref="com.intuit.ipp.data.StatusInfo"/>
287+
</bindings>
279288
<bindings scd="~tns:OLBAccount">
280289
<class ref="com.intuit.ipp.data.OLBAccount"/>
281290
</bindings>
@@ -381,9 +390,6 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
381390
<bindings scd="~tns:UOMRef">
382391
<class ref="com.intuit.ipp.data.UOMRef"/>
383392
</bindings>
384-
<bindings scd="~tns:CustomerType">
385-
<class ref="com.intuit.ipp.data.CustomerType"/>
386-
</bindings>
387393
<bindings scd="~tns:EmailAddress">
388394
<class ref="com.intuit.ipp.data.EmailAddress"/>
389395
</bindings>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
1717
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
1818
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
1919
// Any modifications to this file will be lost upon recompilation of the source schema.
20-
// Generated on: 2016.11.14 at 04:24:27 PM PST
20+
// Generated on: 2017.06.06 at 02:08:21 PM PDT
2121
//
2222

2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
1717
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
1818
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
1919
// Any modifications to this file will be lost upon recompilation of the source schema.
20-
// Generated on: 2016.11.14 at 04:24:27 PM PST
20+
// Generated on: 2017.06.06 at 02:08:21 PM PDT
2121
//
2222

2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
1717
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
1818
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
1919
// Any modifications to this file will be lost upon recompilation of the source schema.
20-
// Generated on: 2016.11.14 at 04:24:27 PM PST
20+
// Generated on: 2017.06.06 at 02:08:21 PM PDT
2121
//
2222

2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
1717
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
1818
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
1919
// Any modifications to this file will be lost upon recompilation of the source schema.
20-
// Generated on: 2016.11.14 at 04:24:27 PM PST
20+
// Generated on: 2017.06.06 at 02:08:21 PM PDT
2121
//
2222

2323

0 commit comments

Comments
 (0)