Skip to content

merge v2.9.3 to master #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 20, 2017
Merged

merge v2.9.3 to master #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c4f681
SDK-511, SDK-520
diana-derose May 24, 2017
d2eff31
Merge pull request #11 from diana-derose/develop
diana-derose May 25, 2017
aa81b79
SDK-545
diana-derose Jun 6, 2017
d66fe6c
comment jaxb generation
diana-derose Jun 6, 2017
f937865
default latest minor version
diana-derose Jun 7, 2017
79e3db7
fix test
diana-derose Jun 7, 2017
79ff0c2
add copyright
diana-derose Jun 20, 2017
5b0206e
Merge pull request #14 from intuit/SDK-545
diana-derose Jun 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
57 changes: 47 additions & 10 deletions ipp-java-qbapihelper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,13 @@
<parent>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<groupId>com.intuit.quickbooks-online</groupId>
<version>2.9.1</version>
<version>2.9.3</version>
</parent>
<artifactId>ipp-java-qbapihelper</artifactId>
<version>2.9.1</version>
<version>2.9.3</version>
<packaging>jar</packaging>
<name>Quickbooks API Helper for Oauth</name>
<description>Quickbooks API Helper Project for OAuth, Disconnect and Reconnect</description>

<profiles>
<profile>
<properties>
<test.suite>testng.xml</test.suite>
</properties>
</profile>
</profiles>

<dependencies>
<dependency>
Expand Down Expand Up @@ -142,6 +134,51 @@
</execution>
</executions>
</plugin>

</plugins>
</build>

<profiles>
<profile>
<properties>
<test.suite>testng.xml</test.suite>
</properties>
</profile>
<profile>
<id>sign</id>
<build>
<plugins>
<!-- build javadocs jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- build sources jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
122 changes: 62 additions & 60 deletions ipp-v3-java-data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<groupId>com.intuit.quickbooks-online</groupId>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<version>2.9.1</version>
<version>2.9.3</version>
</parent>

<artifactId>ipp-v3-java-data</artifactId>
<name>IPP V3 Java - Data Project</name>
<description>IPP Java V3 DevKit Data project - FMS Entities generation</description>
<version>2.9.1</version>
<version>2.9.3</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -52,47 +52,33 @@
</dependencies>

<build>
<plugins>
<!-- build javadocs jar -->
<plugin>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
</plugin> -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
</plugin> -->
<!-- commented to avoid regeneration of entities, as the same is not required everytime -->
<!--
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
Expand Down Expand Up @@ -155,31 +141,47 @@
</configuration>
</execution>
</executions>
</plugin> -->
</plugin> -->
</plugins>
</build>

<profiles>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<profiles>
<profile>
<id>sign</id>
<build>
<plugins>
<!-- build javadocs jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>


</plugins>
</build>
</profile>
</profiles>
<!-- build sources jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
14 changes: 10 additions & 4 deletions ipp-v3-java-data/src/main/java/META-INF/sun-jaxb.episode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
Any modifications to this file will be lost upon recompilation of the source schema.
Generated on: 2016.04.13 at 10:49:20 AM PDT
Generated on: 2017.06.06 at 02:08:21 PM PDT

-->
<bindings scd="x-schema::tns" xmlns:tns="http://schema.intuit.com/finance/v3">
Expand Down Expand Up @@ -75,6 +75,9 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
<bindings scd="~tns:Term">
<class ref="com.intuit.ipp.data.Term"/>
</bindings>
<bindings scd="~tns:CustomerType">
<class ref="com.intuit.ipp.data.CustomerType"/>
</bindings>
<bindings scd="~tns:CustomFieldDefinition">
<class ref="com.intuit.ipp.data.CustomFieldDefinition"/>
</bindings>
Expand Down Expand Up @@ -207,6 +210,9 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
<bindings scd="~tns:Attachable">
<class ref="com.intuit.ipp.data.Attachable"/>
</bindings>
<bindings scd="~tns:TaxReturn">
<class ref="com.intuit.ipp.data.TaxReturn"/>
</bindings>
<bindings scd="~tns:Fault">
<class ref="com.intuit.ipp.data.Fault"/>
</bindings>
Expand Down Expand Up @@ -276,6 +282,9 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
<bindings scd="~tns:PriceLevelPerItem">
<class ref="com.intuit.ipp.data.PriceLevelPerItem"/>
</bindings>
<bindings scd="~tns:StatusInfo">
<class ref="com.intuit.ipp.data.StatusInfo"/>
</bindings>
<bindings scd="~tns:OLBAccount">
<class ref="com.intuit.ipp.data.OLBAccount"/>
</bindings>
Expand Down Expand Up @@ -381,9 +390,6 @@ Generated on: 2016.04.13 at 10:49:20 AM PDT
<bindings scd="~tns:UOMRef">
<class ref="com.intuit.ipp.data.UOMRef"/>
</bindings>
<bindings scd="~tns:CustomerType">
<class ref="com.intuit.ipp.data.CustomerType"/>
</bindings>
<bindings scd="~tns:EmailAddress">
<class ref="com.intuit.ipp.data.EmailAddress"/>
</bindings>
Expand Down
4 changes: 2 additions & 2 deletions ipp-v3-java-data/src/main/java/com/intuit/ipp/data/APCreditCardOperationEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -17,7 +17,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2016.11.14 at 04:24:27 PM PST
// Generated on: 2017.06.06 at 02:08:21 PM PDT
//


Expand Down
4 changes: 2 additions & 2 deletions ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Account.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -17,7 +17,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2016.11.14 at 04:24:27 PM PST
// Generated on: 2017.06.06 at 02:08:21 PM PDT
//


Expand Down
4 changes: 2 additions & 2 deletions ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountBasedExpenseLineDetail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -17,7 +17,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2016.11.14 at 04:24:27 PM PST
// Generated on: 2017.06.06 at 02:08:21 PM PDT
//


Expand Down
4 changes: 2 additions & 2 deletions ipp-v3-java-data/src/main/java/com/intuit/ipp/data/AccountClassificationEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand All @@ -17,7 +17,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2016.11.14 at 04:24:27 PM PST
// Generated on: 2017.06.06 at 02:08:21 PM PDT
//


Expand Down
Loading