Merge pull request #3 from ngriso/master

Update to Spring Social Core 1.1.0.M1

Author: umut

pom.xml

@@ -4,58 +4,51 @@
 
     <groupId>org.springframework.social</groupId>
     <artifactId>spring-social-salesforce</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <version>1.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-social-salesforce</name>
-    <url>http://maven.apache.org</url>
+    <url>https://github.com/umut/spring-social-salesforce</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring-social-core.version>1.1.0.M1</spring-social-core.version>
+        <spring-social-test.version>1.0.2.RELEASE</spring-social-test.version>
+        <jackson.version>1.8.5</jackson.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.social</groupId>
             <artifactId>spring-social-core</artifactId>
-            <version>1.0.0.RELEASE</version>
+            <version>${spring-social-core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.social</groupId>
             <artifactId>spring-social-test</artifactId>
-            <version>1.0.0.RELEASE</version>
+            <version>${spring-social-test.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>3.1.0.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.8.5</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.9</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.8.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <!--<version>2.3.2</version>-->
+                <version>3.0</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>

src/main/java/org/springframework/social/salesforce/api/impl/SalesforceTemplate.java

@@ -49,7 +49,6 @@ public SalesforceTemplate() {
     public SalesforceTemplate(String accessToken) {
         super(accessToken);
         initialize();
-        System.out.println("ACCESS TOKEN: " + accessToken);
     }
 
 

src/main/java/org/springframework/social/salesforce/connect/SalesforceOAuth2Template.java

@@ -18,11 +18,12 @@ public class SalesforceOAuth2Template extends OAuth2Template {
 
 
     public SalesforceOAuth2Template(String clientId, String clientSecret, String authorizeUrl, String accessTokenUrl) {
-        super(clientId, clientSecret, authorizeUrl, accessTokenUrl);
+        this(clientId, clientSecret, authorizeUrl, null, accessTokenUrl);
     }
 
     public SalesforceOAuth2Template(String clientId, String clientSecret, String authorizeUrl, String authenticateUrl, String accessTokenUrl) {
         super(clientId, clientSecret, authorizeUrl, authenticateUrl, accessTokenUrl);
+        setUseParametersForClientAuthentication(true);
     }