Skip to content

Commit aa66628

Browse files
authored
Upgrade dependencies. (#47)
* [ISSUE-45] Fix bug allowing library to automatically renew expired sessions * Upgrade dependencies * revert deletion
1 parent 7eb056a commit aa66628

File tree

4 files changed

+25
-16
lines changed

4 files changed

+25
-16
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
33
and this project adheres to [Semantic Versioning](http://semver.org/).
44

55
## 1.1.2 (02/20/2020)
6-
- Fixed bug preventing the library from auto-renewing a session when it expires.
6+
#### Bugfixes
7+
- [ISSUE-45](https://github.com/Crim/pardot-java-client/issues/45) Fixed bug preventing the library from auto-renewing a session when it expires.
8+
9+
#### Internal Dependency Updates
10+
- Upgraded Jackson from version 2.10.1 to 2.10.2.
11+
- Upgraded HttpComponents Client from version 4.5.10 to 4.5.11.
12+
- Upgraded SLF4J from version 1.7.29 to 1.7.30.
713

814
## 1.1.1 (01/07/2020)
915
- Fixed bug in User create endpoint where setting a new user's role could only be set via a RoleId. Now you can set the role by name or id.

build/checkstyle.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<property name="eachLine" value="true"/>
1414
</module>
1515

16+
<module name="LineLength">
17+
<property name="max" value="255"/>
18+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
19+
</module>
20+
1621
<module name="TreeWalker">
1722
<module name="OuterTypeFilename"/>
1823
<module name="IllegalTokenText">
@@ -25,10 +30,6 @@
2530
<property name="allowByTailComment" value="true"/>
2631
<property name="allowNonPrintableEscapes" value="true"/>
2732
</module>
28-
<module name="LineLength">
29-
<property name="max" value="255"/>
30-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
31-
</module>
3233
<module name="AvoidStarImport"/>
3334
<module name="OneTopLevelClass"/>
3435
<module name="NoLineWrap"/>
@@ -154,12 +155,12 @@
154155
</module>
155156
<module name="JavadocMethod">
156157
<property name="scope" value="public"/>
157-
<property name="allowMissingParamTags" value="true"/>
158-
<property name="allowMissingThrowsTags" value="true"/>
159-
<property name="allowMissingReturnTag" value="true"/>
160-
<property name="minLineCount" value="2"/>
161158
<property name="allowedAnnotations" value="Override, Test"/>
162-
<property name="allowThrowsTagsForSubclasses" value="true"/>
159+
</module>
160+
<module name="MissingJavadocMethod">
161+
<property name="scope" value="public"/>
162+
<property name="allowMissingPropertyJavadoc" value="true"/>
163+
<property name="minLineCount" value="2"/>
163164
</module>
164165
<module name="JavadocStyle">
165166
<property name="scope" value="public"/>

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4848

4949
<!-- Jackson version -->
50-
<jackson.version>2.10.1</jackson.version>
50+
<jackson.version>2.10.2</jackson.version>
5151

5252
<!-- Define which version of junit you'll be running -->
53-
<junit.version>4.12</junit.version>
53+
<junit.version>4.13</junit.version>
5454

5555
<!-- Specify which Checkstyle ruleset to use -->
5656
<checkstyle.ruleset>build/checkstyle.xml</checkstyle.ruleset>
57-
<checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
58-
<checkstyle.version>8.18</checkstyle.version>
57+
<checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
58+
<checkstyle.version>8.29</checkstyle.version>
5959

6060
<!-- Log4J Version -->
6161
<log4j2.version>2.12.1</log4j2.version>
62-
<slf4j.version>1.7.29</slf4j.version>
62+
<slf4j.version>1.7.30</slf4j.version>
6363

6464
<!-- test toggling -->
6565
<skipTests>false</skipTests>
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>org.apache.httpcomponents</groupId>
7878
<artifactId>httpclient</artifactId>
79-
<version>4.5.10</version>
79+
<version>4.5.11</version>
8080
</dependency>
8181

8282
<!-- For parsing XML responses to POJOs -->

src/main/java/com/darksci/pardot/api/response/user/NewUser.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public Long getRoleId() {
8282
/**
8383
* You can set the user's role by Id OR Name.
8484
* @param roleId Id of the role to set.
85+
* @return self for method chaining.
8586
*/
8687
public NewUser setRoleId(final Long roleId) {
8788
this.roleId = roleId;
@@ -100,6 +101,7 @@ public String getRole() {
100101
/**
101102
* You can set the user's role by Name or Id.
102103
* @param role Name of the role to set.
104+
* @return self for method chaining.
103105
*/
104106
public NewUser setRole(final String role) {
105107
this.role = role;

0 commit comments

Comments
 (0)