Merge pull request #52 from jottley/snyk-merge

Snyk merge

README.md

@@ -1,4 +1,4 @@
-# Spring Social Salesforce [![Build Status](https://travis-ci.org/jottley/spring-social-salesforce.svg?branch=master)](https://travis-ci.org/jottley/spring-social-salesforce) [ ![Download](https://api.bintray.com/packages/jottley/jottley/spring-social-salesforce/images/download.svg?version=1.2.0.1.RELEASE) ](https://bintray.com/jottley/jottley/spring-social-salesforce/1.2.0.1.RELEASE/link)
+# Spring Social Salesforce [![Build Status](https://travis-ci.org/jottley/spring-social-salesforce.svg?branch=master)](https://travis-ci.org/jottley/spring-social-salesforce) [ ![Download](https://api.bintray.com/packages/jottley/jottley/spring-social-salesforce/images/download.svg?version=1.2.0.2.RELEASE) ](https://bintray.com/jottley/jottley/spring-social-salesforce/1.2.0.2.RELEASE/link)
 
 Spring Social Salesforce is a Spring Social extension that provides connection support and api binding for Salesforce
 REST API.
@@ -26,7 +26,7 @@ To include in your maven project use the following repository and dependency
         <dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-salesforce</artifactId>
-			<version>1.2.0.1.RELEASE</version>
+			<version>1.2.0.2.RELEASE</version>
 		</dependency>
     ...
     </dependencies>

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.social</groupId>
 	<artifactId>spring-social-salesforce</artifactId>
-	<version>1.2.0.1.RELEASE</version>
+	<version>1.2.0.2.RELEASE</version>
 	<packaging>jar</packaging>
 
 	<name>spring-social-salesforce</name>
@@ -15,10 +15,10 @@
 		<jdk.version>1.8</jdk.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<slf4j.version>1.7.7</slf4j.version>
-		<logback.version>0.9.29</logback.version>
-		<spring.version>4.1.8.RELEASE</spring.version>
+		<logback.version>1.2.3</logback.version>
+		<spring.version>4.2.2.RELEASE</spring.version>
 		<spring-social.version>1.1.4.RELEASE</spring-social.version>
-		<httpclient.version>4.3.6</httpclient.version>
+		<httpclient.version>4.5.2</httpclient.version>
 		<servlet.version>3.0.1</servlet.version>
 		<jackson.version>2.9.9.1</jackson.version>
 		<joor.version>0.9.4</joor.version>

src/test/resources/logback-test.xml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%.25thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="INFO">
-    <appender-ref ref="STDOUT" />
-  </root>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+      <!-- encoders are assigned the type
+           ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+      <encoder>
+        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+      </encoder>
+    </appender>
 
-  <!--  logger name="org.springframework.web.client.RestTemplate" level="trace" / -->
-  <logger name="ch.qos.logback" level="error" />
-</configuration>
+    <root level="info">
+      <appender-ref ref="STDOUT" />
+    </root>
+  </configuration>