Skip to content

Commit

Permalink
Upgrade dependencies. (#47)
Browse files Browse the repository at this point in the history
* [ISSUE-45] Fix bug allowing library to automatically renew expired sessions

* Upgrade dependencies

* revert deletion
  • Loading branch information
Crim authored Feb 20, 2020
1 parent 7eb056a commit aa66628
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 16 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.1.2 (02/20/2020)
- Fixed bug preventing the library from auto-renewing a session when it expires.
#### Bugfixes
- [ISSUE-45](https://github.com/Crim/pardot-java-client/issues/45) Fixed bug preventing the library from auto-renewing a session when it expires.

#### Internal Dependency Updates
- Upgraded Jackson from version 2.10.1 to 2.10.2.
- Upgraded HttpComponents Client from version 4.5.10 to 4.5.11.
- Upgraded SLF4J from version 1.7.29 to 1.7.30.

## 1.1.1 (01/07/2020)
- 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.
Expand Down
19 changes: 10 additions & 9 deletions build/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
<property name="eachLine" value="true"/>
</module>

<module name="LineLength">
<property name="max" value="255"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>

<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
Expand All @@ -25,10 +30,6 @@
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
<module name="LineLength">
<property name="max" value="255"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
Expand Down Expand Up @@ -154,12 +155,12 @@
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
<module name="MissingJavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
<property name="minLineCount" value="2"/>
</module>
<module name="JavadocStyle">
<property name="scope" value="public"/>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Jackson version -->
<jackson.version>2.10.1</jackson.version>
<jackson.version>2.10.2</jackson.version>

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

<!-- Specify which Checkstyle ruleset to use -->
<checkstyle.ruleset>build/checkstyle.xml</checkstyle.ruleset>
<checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
<checkstyle.version>8.18</checkstyle.version>
<checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
<checkstyle.version>8.29</checkstyle.version>

<!-- Log4J Version -->
<log4j2.version>2.12.1</log4j2.version>
<slf4j.version>1.7.29</slf4j.version>
<slf4j.version>1.7.30</slf4j.version>

<!-- test toggling -->
<skipTests>false</skipTests>
Expand All @@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.10</version>
<version>4.5.11</version>
</dependency>

<!-- For parsing XML responses to POJOs -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public Long getRoleId() {
/**
* You can set the user's role by Id OR Name.
* @param roleId Id of the role to set.
* @return self for method chaining.
*/
public NewUser setRoleId(final Long roleId) {
this.roleId = roleId;
Expand All @@ -100,6 +101,7 @@ public String getRole() {
/**
* You can set the user's role by Name or Id.
* @param role Name of the role to set.
* @return self for method chaining.
*/
public NewUser setRole(final String role) {
this.role = role;
Expand Down

0 comments on commit aa66628

Please sign in to comment.