Skip to content

Commit 7c74dba

Browse files
rdemarco-xerordemarco-xero
authored
Merge pull request #313 from XeroAPI/update-to-4-17-0
minor spec updates and updated google api client plus other dependencies
2 parents 487d7cb + 0513564 commit 7c74dba

31 files changed

+111
-281
lines changed

‎docs/v4/accounting/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4015,7 +4015,7 @@
40154015
"Class" : {
40164016
"type" : "string",
40174017
"description" : "Organisation Classes describe which plan the Xero organisation is on (e.g. DEMO, TRIAL, PREMIUM)",
4018-
"enum" : [ "DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK" ]
4018+
"enum" : [ "DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK", "ULTIMATE" ]
40194019
},
40204020
"Edition" : {
40214021
"type" : "string",
@@ -5558,7 +5558,7 @@
55585558
"ReportTaxType" : {
55595559
"type" : "string",
55605560
"description" : "See ReportTaxTypes",
5561-
"enum" : [ "AVALARA", "BASEXCLUDED", "CAPITALSALESOUTPUT", "CAPITALEXPENSESINPUT", "ECOUTPUT", "ECOUTPUTSERVICES", "ECINPUT", "ECACQUISITIONS", "EXEMPTEXPENSES", "EXEMPTINPUT", "EXEMPTOUTPUT", "GSTONIMPORTS", "INPUT", "INPUTTAXED", "MOSSSALES", "NONE", "NONEOUTPUT", "OUTPUT", "PURCHASESINPUT", "SALESOUTPUT", "EXEMPTCAPITAL", "EXEMPTEXPORT", "CAPITALEXINPUT", "GSTONCAPIMPORTS", "GSTONCAPITALIMPORTS", "REVERSECHARGES", "PAYMENTS", "INVOICE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS", "TXCA", "SRCAS", "DSOUTPUT", "BLINPUT2", "EPINPUT", "IMINPUT2", "MEINPUT", "IGDSINPUT2", "ESN33OUTPUT", "OPINPUT", "OSOUTPUT", "TXN33INPUT", "TXESSINPUT", "TXREINPUT", "TXPETINPUT", "NRINPUT", "ES33OUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT", "DRCHARGESUPPLY", "DRCHARGE", "CAPINPUT", "CAPIMPORTS", "IMINPUT", "INPUT2", "CIUINPUT", "SRINPUT", "OUTPUT2", "SROUTPUT", "CAPOUTPUT", "SROUTPUT2", "CIUOUTPUT", "ZROUTPUT", "ZREXPORT", "ACC28PLUS", "ACCUPTO28", "OTHEROUTPUT", "SHOUTPUT", "ZRINPUT", "BADDEBT", "OTHERINPUT" ]
5561+
"enum" : [ "AVALARA", "BASEXCLUDED", "CAPITALSALESOUTPUT", "CAPITALEXPENSESINPUT", "ECOUTPUT", "ECOUTPUTSERVICES", "ECINPUT", "ECACQUISITIONS", "EXEMPTEXPENSES", "EXEMPTINPUT", "EXEMPTOUTPUT", "GSTONIMPORTS", "INPUT", "INPUTTAXED", "MOSSSALES", "NONE", "NONEOUTPUT", "OUTPUT", "PURCHASESINPUT", "SALESOUTPUT", "EXEMPTCAPITAL", "EXEMPTEXPORT", "CAPITALEXINPUT", "GSTONCAPIMPORTS", "GSTONCAPITALIMPORTS", "REVERSECHARGES", "PAYMENTS", "INVOICE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS", "TXCA", "SRCAS", "DSOUTPUT", "BLINPUT2", "EPINPUT", "IMINPUT2", "MEINPUT", "IGDSINPUT2", "ESN33OUTPUT", "OPINPUT", "OSOUTPUT", "TXN33INPUT", "TXESSINPUT", "TXREINPUT", "TXPETINPUT", "NRINPUT", "ES33OUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT", "DRCHARGESUPPLY", "DRCHARGE", "CAPINPUT", "CAPIMPORTS", "IMINPUT", "INPUT2", "CIUINPUT", "SRINPUT", "OUTPUT2", "SROUTPUT", "CAPOUTPUT", "SROUTPUT2", "CIUOUTPUT", "ZROUTPUT", "ZREXPORT", "ACC28PLUS", "ACCUPTO28", "OTHEROUTPUT", "SHOUTPUT", "ZRINPUT", "BADDEBT", "OTHERINPUT", "BADDEBTRELIEF", "IGDSINPUT3", "SROVR", "TOURISTREFUND", "TXRCN33INPUT", "TXRCREINPUT", "TXRCESSINPUT" ]
55625562
},
55635563
"CanApplyToAssets" : {
55645564
"type" : "boolean",
@@ -5623,7 +5623,7 @@
56235623
"title" : "",
56245624
"type" : "string",
56255625
"description" : "See Tax Types – can only be used on update calls",
5626-
"enum" : [ "OUTPUT", "INPUT", "CAPEXINPUT", "EXEMPTEXPORT", "EXEMPTEXPENSES", "EXEMPTCAPITAL", "EXEMPTOUTPUT", "INPUTTAXED", "BASEXCLUDED", "GSTONCAPIMPORTS", "GSTONIMPORTS", "NONE", "INPUT2", "ZERORATED", "OUTPUT2", "CAPEXINPUT2", "CAPEXOUTPUT", "CAPEXOUTPUT2", "CAPEXSRINPUT", "CAPEXSROUTPUT", "ECACQUISITIONS", "ECZRINPUT", "ECZROUTPUT", "ECZROUTPUTSERVICES", "EXEMPTINPUT", "REVERSECHARGES", "RRINPUT", "RROUTPUT", "SRINPUT", "SROUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT", "BLINPUT", "DSOUTPUT", "EPINPUT", "ES33OUTPUT", "ESN33OUTPUT", "IGDSINPUT2", "IMINPUT2", "MEINPUT", "NRINPUT", "OPINPUT", "OSOUTPUT", "TXESSINPUT", "TXN33INPUT", "TXPETINPUT", "TXREINPUT", "INPUT3", "INPUT4", "OUTPUT3", "OUTPUT4", "SROUTPUT2", "TXCA", "SRCAS", "BLINPUT2", "DRCHARGESUPPLY20", "DRCHARGE20", "DRCHARGESUPPLY5", "DRCHARGE5" ]
5626+
"enum" : [ "OUTPUT", "INPUT", "CAPEXINPUT", "EXEMPTEXPORT", "EXEMPTEXPENSES", "EXEMPTCAPITAL", "EXEMPTOUTPUT", "INPUTTAXED", "BASEXCLUDED", "GSTONCAPIMPORTS", "GSTONIMPORTS", "NONE", "INPUT2", "ZERORATED", "OUTPUT2", "CAPEXINPUT2", "CAPEXOUTPUT", "CAPEXOUTPUT2", "CAPEXSRINPUT", "CAPEXSROUTPUT", "ECACQUISITIONS", "ECZRINPUT", "ECZROUTPUT", "ECZROUTPUTSERVICES", "EXEMPTINPUT", "REVERSECHARGES", "RRINPUT", "RROUTPUT", "SRINPUT", "SROUTPUT", "ZERORATEDINPUT", "ZERORATEDOUTPUT", "BLINPUT", "DSOUTPUT", "EPINPUT", "ES33OUTPUT", "ESN33OUTPUT", "IGDSINPUT2", "IMINPUT2", "MEINPUT", "NRINPUT", "OPINPUT", "OSOUTPUT", "TXESSINPUT", "TXN33INPUT", "TXPETINPUT", "TXREINPUT", "INPUT3", "INPUT4", "OUTPUT3", "OUTPUT4", "SROUTPUT2", "TXCA", "SRCAS", "BLINPUT2", "DRCHARGESUPPLY20", "DRCHARGE20", "DRCHARGESUPPLY5", "DRCHARGE5", "BADDEBTRELIEF", "IGDSINPUT3", "SROVR", "TOURISTREFUND", "TXRCN33INPUT", "TXRCREINPUT", "TXRCESSINPUT" ]
56275627
};
56285628
defs["TenNinetyNineContact"] = {
56295629
"title" : "",
@@ -6004,7 +6004,7 @@
60046004
<nav id="scrollingNav">
60056005
<ul class="sidenav nav nav-list">
60066006
<li class="nav-header" data-group="Accounting"><strong>SDK: </strong><span id='sdk-name'></span></li>
6007-
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>4.16.0</li>
6007+
<li class="nav-header" data-group="Accounting"><strong>VSN: </strong>4.17.0</li>
60086008
<li class="nav-header" data-group="Accounting"><a href="#api-Accounting">Methods</a></li>
60096009
<li data-group="Accounting" data-name="createAccount" class="">
60106010
<a href="#api-Accounting-createAccount">createAccount</a>

‎docs/v4/appstore/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@
11371137
<nav id="scrollingNav">
11381138
<ul class="sidenav nav nav-list">
11391139
<li class="nav-header" data-group="AppStore"><strong>SDK: </strong><span id='sdk-name'></span></li>
1140-
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>4.16.0</li>
1140+
<li class="nav-header" data-group="AppStore"><strong>VSN: </strong>4.17.0</li>
11411141
<li class="nav-header" data-group="AppStore"><a href="#api-AppStore">Methods</a></li>
11421142
<li data-group="AppStore" data-name="getSubscription" class="">
11431143
<a href="#api-AppStore-getSubscription">getSubscription</a>

‎docs/v4/assets/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@
13881388
<nav id="scrollingNav">
13891389
<ul class="sidenav nav nav-list">
13901390
<li class="nav-header" data-group="Asset"><strong>SDK: </strong><span id='sdk-name'></span></li>
1391-
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>4.16.0</li>
1391+
<li class="nav-header" data-group="Asset"><strong>VSN: </strong>4.17.0</li>
13921392
<li class="nav-header" data-group="Asset"><a href="#api-Asset">Methods</a></li>
13931393
<li data-group="Asset" data-name="createAsset" class="">
13941394
<a href="#api-Asset-createAsset">createAsset</a>

‎docs/v4/files/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@
11511151
<nav id="scrollingNav">
11521152
<ul class="sidenav nav nav-list">
11531153
<li class="nav-header" data-group="Files"><strong>SDK: </strong><span id='sdk-name'></span></li>
1154-
<li class="nav-header" data-group="Files"><strong>VSN: </strong>4.16.0</li>
1154+
<li class="nav-header" data-group="Files"><strong>VSN: </strong>4.17.0</li>
11551155
<li class="nav-header" data-group="Files"><a href="#api-Files">Methods</a></li>
11561156
<li data-group="Files" data-name="createFileAssociation" class="">
11571157
<a href="#api-Files-createFileAssociation">createFileAssociation</a>

‎docs/v4/finance/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2714,7 +2714,7 @@
27142714
<nav id="scrollingNav">
27152715
<ul class="sidenav nav nav-list">
27162716
<li class="nav-header" data-group="Finance"><strong>SDK: </strong><span id='sdk-name'></span></li>
2717-
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>4.16.0</li>
2717+
<li class="nav-header" data-group="Finance"><strong>VSN: </strong>4.17.0</li>
27182718
<li class="nav-header" data-group="Finance"><a href="#api-Finance">Methods</a></li>
27192719
<li data-group="Finance" data-name="getAccountingActivityAccountUsage" class="">
27202720
<a href="#api-Finance-getAccountingActivityAccountUsage">getAccountingActivityAccountUsage</a>
@@ -3328,6 +3328,7 @@ <h3>Usage and SDK Samples</h3>
33283328
apiInstance = AccountingApi.getInstance(defaultClient);
33293329
String xeroTenantId = 'YOUR_XERO_TENANT_ID';
33303330
UUID bankAccountID = UUID.fromString("38400000-8cf0-11bd-b23e-10b96e4ef00d");
3331+
UUID bankAccountID = '38400000-8cf0-11bd-b23e-10b96e4ef00d';
33313332
String fromDate = '2020-07-01';
33323333
String toDate = '2021-06-30';
33333334
Boolean summaryOnly = true;

‎docs/v4/payroll-au/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3250,7 +3250,7 @@
32503250
<nav id="scrollingNav">
32513251
<ul class="sidenav nav nav-list">
32523252
<li class="nav-header" data-group="PayrollAu"><strong>SDK: </strong><span id='sdk-name'></span></li>
3253-
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>4.16.0</li>
3253+
<li class="nav-header" data-group="PayrollAu"><strong>VSN: </strong>4.17.0</li>
32543254
<li class="nav-header" data-group="PayrollAu"><a href="#api-PayrollAu">Methods</a></li>
32553255
<li data-group="PayrollAu" data-name="createEmployee" class="">
32563256
<a href="#api-PayrollAu-createEmployee">createEmployee</a>

‎docs/v4/payroll-nz/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3834,7 +3834,7 @@
38343834
<nav id="scrollingNav">
38353835
<ul class="sidenav nav nav-list">
38363836
<li class="nav-header" data-group="PayrollNz"><strong>SDK: </strong><span id='sdk-name'></span></li>
3837-
<li class="nav-header" data-group="PayrollNz"><strong>VSN: </strong>4.16.0</li>
3837+
<li class="nav-header" data-group="PayrollNz"><strong>VSN: </strong>4.17.0</li>
38383838
<li class="nav-header" data-group="PayrollNz"><a href="#api-PayrollNz">Methods</a></li>
38393839
<li data-group="PayrollNz" data-name="approveTimesheet" class="">
38403840
<a href="#api-PayrollNz-approveTimesheet">approveTimesheet</a>

‎docs/v4/payroll-uk/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3506,7 +3506,7 @@
35063506
<nav id="scrollingNav">
35073507
<ul class="sidenav nav nav-list">
35083508
<li class="nav-header" data-group="PayrollUk"><strong>SDK: </strong><span id='sdk-name'></span></li>
3509-
<li class="nav-header" data-group="PayrollUk"><strong>VSN: </strong>4.16.0</li>
3509+
<li class="nav-header" data-group="PayrollUk"><strong>VSN: </strong>4.17.0</li>
35103510
<li class="nav-header" data-group="PayrollUk"><a href="#api-PayrollUk">Methods</a></li>
35113511
<li data-group="PayrollUk" data-name="approveTimesheet" class="">
35123512
<a href="#api-PayrollUk-approveTimesheet">approveTimesheet</a>

‎pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>xero-java</artifactId>
66
<packaging>jar</packaging>
77
<name>xero-java</name>
8-
<version>4.16.0</version>
8+
<version>4.17.0</version>
99
<url>https://github.com/XeroAPI/Xero-Java</url>
1010
<description>This is the official Java SDK for Xero API</description>
1111
<licenses>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>org.mockito</groupId>
8080
<artifactId>mockito-core</artifactId>
81-
<version>3.5.13</version>
81+
<version>4.5.1</version>
8282
<scope>test</scope>
8383
</dependency>
8484

@@ -232,7 +232,7 @@
232232
<plugin>
233233
<groupId>org.apache.maven.plugins</groupId>
234234
<artifactId>maven-javadoc-plugin</artifactId>
235-
<version>2.9.1</version>
235+
<version>3.3.2</version>
236236
<configuration>
237237
<source>8</source>
238238
</configuration>
@@ -312,13 +312,13 @@
312312
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
313313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
314314
<java.version>1.8</java.version>
315-
<swagger-annotations-version>1.5.17</swagger-annotations-version>
316-
<google-api-client-version>1.23.0</google-api-client-version>
315+
<swagger-annotations-version>1.6.3</swagger-annotations-version>
316+
<google-api-client-version>1.34.0</google-api-client-version>
317317
<jersey-common-version>2.25.1</jersey-common-version>
318-
<jackson-version>2.9.10</jackson-version>
319-
<jackson-databind-version>2.9.10.7</jackson-databind-version>
320-
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
321-
<junit-version>4.13.1</junit-version>
318+
<jackson-version>2.13.2</jackson-version>
319+
<jackson-databind-version>2.13.2</jackson-databind-version>
320+
<jackson-threetenbp-version>2.12.5</jackson-threetenbp-version>
321+
<junit-version>4.13.2</junit-version>
322322
<org-apache-httpcomponents>4.5.3</org-apache-httpcomponents>
323323
<jersey-version>2.27</jersey-version>
324324
<threetenbp-version>2.6.4</threetenbp-version>

‎src/main/java/com/xero/api/client/AccountingApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Xero Accounting API
33
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
44
*
5-
* The version of the OpenAPI document: 2.22.0
5+
* The version of the OpenAPI document: 2.22.4
66
* Contact: api@xero.com
77
*
88
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -99,7 +99,7 @@ public class AccountingApi {
9999
private ApiClient apiClient;
100100
private static AccountingApi instance = null;
101101
private String userAgent = "Default";
102-
private String version = "4.16.0";
102+
private String version = "4.17.0";
103103
static final Logger logger = LoggerFactory.getLogger(AccountingApi.class);
104104

105105
/** AccountingApi */

0 commit comments

Comments
 (0)